[GitHub] JaroslavTulach closed pull request #843: Adjusted locations of test data after moving into cluster subdirs

[GitBox <gi...@apache.org>]

JaroslavTulach closed pull request #843: Adjusted locations of test data after moving into cluster subdirs
URL: https://github.com/apache/incubator-netbeans/pull/843
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ide/httpserver/nbproject/project.properties b/ide/httpserver/nbproject/project.properties
index f45cffa448..8e3816a37b 100644
--- a/ide/httpserver/nbproject/project.properties
+++ b/ide/httpserver/nbproject/project.properties
@@ -19,8 +19,8 @@ javac.compilerargs=-Xlint:unchecked
 javac.source=1.6
 spec.version.base=2.39.0
 release.external/webserver-3.2.4.jar=modules/ext/webserver.jar
-test-unit-sys-prop.xtest.data=${nb_all}/httpserver/test/unit/testfs
-test.unit.data.dir=${nb_all}/httpserver/test/unit/testfs
+test-unit-sys-prop.xtest.data=${nb_all}/ide/httpserver/test/unit/testfs
+test.unit.data.dir=${nb_all}/ide/httpserver/test/unit/testfs
 disable.qa-functional.tests=true
 
 test.config.stableBTD.includes=**/*Test.class
diff --git a/java/java.freeform/nbproject/project.properties b/java/java.freeform/nbproject/project.properties
index bc101b7e3b..081fa47bf3 100644
--- a/java/java.freeform/nbproject/project.properties
+++ b/java/java.freeform/nbproject/project.properties
@@ -22,8 +22,8 @@ javadoc.apichanges=${basedir}/apichanges.xml
 
 # XXX using a data dir from another module means that test4u will not be able to run these tests!
 # Better to fix by not using a data dir (just generator), or copying required files into java/freeform/test/unit/data
-test-unit-sys-prop.xtest.data=${nb_all}/ant.freeform/test/unit/data
-test.unit.data.dir=${nb_all}/ant.freeform/test/unit/data
+test-unit-sys-prop.xtest.data=${nb_all}/java/ant.freeform/test/unit/data
+test.unit.data.dir=${nb_all}/java/ant.freeform/test/unit/data
 # masterfs needed for the usual reasons
 # core needed for ArchiveURLMapper
 test-unit-sys-prop.test.ant.home=${o.apache.tools.ant.module.dir}/ant


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists