You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/01/20 15:41:12 UTC
[netbeans] branch master updated: [TRAVIS] Test nb modules
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f05fb87 [TRAVIS] Test nb modules
new 66832a4 Merge pull request #1860 from blackleg/nb_cluster
f05fb87 is described below
commit f05fb87d809082b405025ee9906509ec5c388d02
Author: Hector Espert <he...@gmail.com>
AuthorDate: Sun Jan 12 16:23:53 2020 +0100
[TRAVIS] Test nb modules
---
.travis.yml | 14 ++++++++++++++
nb/ide.branding/nbproject/project.properties | 2 +-
.../netbeans/modules/ide/branding/RealPacEngineTest.java | 8 +++++++-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 53098d3..bcce365 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -296,6 +296,20 @@ matrix:
- ant $OPTS -f ide/xml.xdm test
- ant $OPTS -f ide/xsl test
+ - name: Test nb modules
+ jdk: openjdk8
+ env:
+ - OPTS="-quiet -Dcluster.config=minimal -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest-unit-sys-prop.ignore.random.failures=true"
+ before_script:
+ - ant $OPTS clean
+ - ant $OPTS build
+ script:
+ - ant $OPTS -f nb/deadlock.detector test
+ - ant $OPTS -f nb/ide.branding test
+ - ant $OPTS -f nb/o.n.upgrader test
+ #- ant $OPTS -f nb/updatecenters test
+ - ant $OPTS -f nb/welcome test
+
- name: Test extide modules
jdk: openjdk8
env:
diff --git a/nb/ide.branding/nbproject/project.properties b/nb/ide.branding/nbproject/project.properties
index 1a42157..1801fbd 100644
--- a/nb/ide.branding/nbproject/project.properties
+++ b/nb/ide.branding/nbproject/project.properties
@@ -17,5 +17,5 @@
extra.module.files=**/*_nb.jar
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
pack200.excludes=modules/ext/locale/updater_*.jar
diff --git a/nb/ide.branding/test/unit/src/org/netbeans/modules/ide/branding/RealPacEngineTest.java b/nb/ide.branding/test/unit/src/org/netbeans/modules/ide/branding/RealPacEngineTest.java
index af73005..697d28b 100644
--- a/nb/ide.branding/test/unit/src/org/netbeans/modules/ide/branding/RealPacEngineTest.java
+++ b/nb/ide.branding/test/unit/src/org/netbeans/modules/ide/branding/RealPacEngineTest.java
@@ -18,6 +18,8 @@
*/
package org.netbeans.modules.ide.branding;
+import java.util.ArrayList;
+import java.util.List;
import javax.script.ScriptEngine;
import junit.framework.Test;
import org.netbeans.core.network.proxy.pac.impl.NbPacScriptEvaluatorTest;
@@ -44,6 +46,10 @@ public class RealPacEngineTest extends NbTestCase {
ScriptEngine eng = NbPacScriptEvaluatorTest.findDefaultEngineInTheSystem(err);
assertEquals("No error: " + err, 0, err.length());
assertNotNull("Engine found", eng);
- assertEquals("GraalVM:js", eng.getFactory().getEngineName());
+
+ List<String> allowedEngines = new ArrayList<String>();
+ allowedEngines.add("GraalVM:js");
+ allowedEngines.add("Oracle Nashorn");
+ assertTrue("Allowed engine", allowedEngines.contains(eng.getFactory().getEngineName()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists