Commit: 08232c0e57558853f6feb95a2fb55d308e54c49e - MikuMikuStudio (git)

Main repository of MikuMikuStudio

Commit MetaInfo

• Revision: 08232c0e57558853f6feb95a2fb55d308e54c49e (tree)
• Time: 2013-06-07 05:44:30
• Author: [e-mail] <ractoc@gmai...>
• Commiter: [e-mail]

Log Message

Fixed the junit tests. They now work through the ant script as well as when run directly.
The fix required adding all the build/* folders to the "compile tests" libraries listing as well as moving the junit.jar in that listing to the top of the list.

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@10644 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

Change Summary

• modified: engine/nbproject/project.properties

Incremental Difference

--- a/engine/nbproject/project.properties
+++ b/engine/nbproject/project.properties
@@ -1,134 +1,170 @@
-annotation.processing.enabled=false
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-ant.customtasks.libs=JWSAntTasks
-application.homepage=http://www.jmonkeyengine.com/
-application.title=jMonkeyEngine 3.0
-application.vendor=jMonkeyEngine
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form,**/*.m
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/jMonkeyEngine3.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.src-test-data=src/test-data
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=true
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${libs.jogg.classpath}:\
-    ${libs.jbullet.classpath}:\
-    ${libs.lwjgl.classpath}:\
-    ${libs.niftygui1.3.classpath}:\
-    ${libs.jme3-test-data.classpath}:\
-    ${libs.android.classpath}:\
-    ${libs.bullet.classpath}:\
-    ${libs.jogl2.classpath}:\
-    ${libs.openalsoft.classpath}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_4.classpath}
-javadoc.additionalparam=-protected
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=jMonkeyEngine3
-jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-jnlp.applet.class=jme3test.awt.AppHarness
-jnlp.applet.height=300
-jnlp.applet.width=300
-jnlp.codebase.type=user
-jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png
-jnlp.mixed.code=default
-jnlp.offline-allowed=true
-jnlp.signed=true
-jnlp.signing=generated
-jnlp.signing.alias=engine
-jnlp.signing.keystore=
-main.class=jme3test.TestChooser
-manifest.file=MANIFEST.MF
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${build.dir}/core:\
-    ${build.dir}/effects:\
-    ${build.dir}/networking:\
-    ${build.dir}/plugins:\
-    ${build.dir}/jogg:\
-    ${build.dir}/desktop:\
-    ${build.dir}/blender:\
-    ${build.dir}/terrain:\
-    ${build.dir}/jbullet:\
-    ${build.dir}/bullet:\
-    ${build.dir}/niftygui:\
-    ${build.dir}/lwjgl:\
-    ${build.dir}/jogl:\
-    ${build.dir}/android:\
-    ${build.dir}/ios
-run.jvmargs=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=256M
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.android.dir=src/android
-src.blender.dir=src/blender
-src.bullet-common.dir=src/bullet-common
-src.bullet-native.dir=src/bullet-native
-src.bullet.dir=src/bullet
-src.core-data.dir=src/core-data
-src.core-effects.dir=src/core-effects
-src.core-plugins.dir=src/core-plugins
-src.core.dir=src/core
-src.desktop.dir=src/desktop
-src.ios.dir=src/ios
-src.jbullet.dir=src/jbullet
-src.jogg.dir=src/jogg
-src.jogl.dir=src/jogl
-src.lwjgl.dir=src/lwjgl
-src.networking.dir=src/networking
-src.niftygui.dir=src/niftygui
-src.ogre.dir=src/ogre
-src.openal-soft-native.dir=src\\openal-soft-native
-src.terrain.dir=src/terrain
-src.test.dir=src/test
-src.tools.dir=src/tools
-src.xml.dir=src/xml
-test.test.dir=test
+annotation.processing.enabled=false
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+ant.customtasks.libs=JWSAntTasks
+application.homepage=http://www.jmonkeyengine.com/
+application.title=jMonkeyEngine 3.0
+application.vendor=jMonkeyEngine
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form,**/*.m
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/jMonkeyEngine3.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.build-android=build/android
+file.reference.build-blender=build/blender
+file.reference.build-bullet=build/bullet
+file.reference.build-classes=build/classes
+file.reference.build-core=build/core
+file.reference.build-desktop=build/desktop
+file.reference.build-effects=build/effects
+file.reference.build-empty=build/empty
+file.reference.build-ios=build/ios
+file.reference.build-jbullet=build/jbullet
+file.reference.build-jogg=build/jogg
+file.reference.build-jogl=build/jogl
+file.reference.build-lwjgl=build/lwjgl
+file.reference.build-networking=build/networking
+file.reference.build-niftygui=build/niftygui
+file.reference.build-plugins=build/plugins
+file.reference.build-terrain=build/terrain
+file.reference.build-test=build/test
+file.reference.src-test-data=src/test-data
+includes=**
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=true
+jar.index=${jnlp.enabled}
+javac.classpath=\
+    ${libs.jogg.classpath}:\
+    ${libs.jbullet.classpath}:\
+    ${libs.lwjgl.classpath}:\
+    ${libs.niftygui1.3.classpath}:\
+    ${libs.jme3-test-data.classpath}:\
+    ${libs.android.classpath}:\
+    ${libs.bullet.classpath}:\
+    ${libs.jogl2.classpath}:\
+    ${libs.openalsoft.classpath}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${libs.junit_4.classpath}:\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${file.reference.build-core}:\
+    ${file.reference.build-android}:\
+    ${file.reference.build-blender}:\
+    ${file.reference.build-bullet}:\
+    ${file.reference.build-classes}:\
+    ${file.reference.build-desktop}:\
+    ${file.reference.build-effects}:\
+    ${file.reference.build-empty}:\
+    ${file.reference.build-ios}:\
+    ${file.reference.build-jbullet}:\
+    ${file.reference.build-jogg}:\
+    ${file.reference.build-jogl}:\
+    ${file.reference.build-lwjgl}:\
+    ${file.reference.build-networking}:\
+    ${file.reference.build-niftygui}:\
+    ${file.reference.build-plugins}:\
+    ${file.reference.build-terrain}:\
+    ${file.reference.build-test}
+javadoc.additionalparam=-protected
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=jMonkeyEngine3
+jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
+jnlp.applet.class=jme3test.awt.AppHarness
+jnlp.applet.height=300
+jnlp.applet.width=300
+jnlp.codebase.type=user
+jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png
+jnlp.mixed.code=default
+jnlp.offline-allowed=true
+jnlp.signed=true
+jnlp.signing=generated
+jnlp.signing.alias=engine
+jnlp.signing.keystore=
+main.class=jme3test.TestChooser
+manifest.file=MANIFEST.MF
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${build.dir}/core:\
+    ${build.dir}/effects:\
+    ${build.dir}/networking:\
+    ${build.dir}/plugins:\
+    ${build.dir}/jogg:\
+    ${build.dir}/desktop:\
+    ${build.dir}/blender:\
+    ${build.dir}/terrain:\
+    ${build.dir}/jbullet:\
+    ${build.dir}/bullet:\
+    ${build.dir}/niftygui:\
+    ${build.dir}/lwjgl:\
+    ${build.dir}/jogl:\
+    ${build.dir}/android:\
+    ${build.dir}/ios
+run.jvmargs=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=256M
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.android.dir=src/android
+src.blender.dir=src/blender
+src.bullet-common.dir=src/bullet-common
+src.bullet-native.dir=src/bullet-native
+src.bullet.dir=src/bullet
+src.core-data.dir=src/core-data
+src.core-effects.dir=src/core-effects
+src.core-plugins.dir=src/core-plugins
+src.core.dir=src/core
+src.desktop.dir=src/desktop
+src.ios.dir=src/ios
+src.jbullet.dir=src/jbullet
+src.jogg.dir=src/jogg
+src.jogl.dir=src/jogl
+src.lwjgl.dir=src/lwjgl
+src.networking.dir=src/networking
+src.niftygui.dir=src/niftygui
+src.ogre.dir=src/ogre
+src.openal-soft-native.dir=src\\openal-soft-native
+src.terrain.dir=src/terrain
+src.test.dir=src/test
+src.tools.dir=src/tools
+src.xml.dir=src/xml
+test.test.dir=test