diff options
| author | Sven Gothel <[email protected]> | 2012-02-19 19:33:33 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-02-19 19:33:33 +0100 |
| commit | bd20024ac91a3f9e591a374c92f75543d2eadb6c (patch) | |
| tree | 15d62a66e3b959871025ae83499e147fb71ad237 | |
| parent | 50266278b5af898a4ae5da7f5db3754a2b8005d9 (diff) | |
Fix crosstests (TestJarUtil and PCPP)
| -rw-r--r-- | make/build-test.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 23e47b1..2a7220a 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -79,7 +79,7 @@ <pathelement location="${gluegen-test.jar}" /> </path> <property name="junit.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> - <property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${TestJarsInJar.jar}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> + <property name="junit.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen.root}/make/lib/TestJarsInJar.jar${path.separator}${gluegen.root}/${rootrel.build}/gluegen.jar${path.separator}${build_t}/gluegen-test.jar"/> <property name="junit.run.remote.apks" value="${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen.apk${path.separator}${build_t}/gluegen-test.apk"/> <property name="stub.includes.dir" value="stub_includes" /> <!-- NOTE: this MUST be relative for FileSet --> @@ -216,7 +216,7 @@ <echo message="${line.separator} rsync -av --delete --delete-after --delete-excluded \${line.separator} --exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \${line.separator} - --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'gluegen-java-src.zip' \${line.separator} + --exclude 'classes/' --exclude 'src/java/' --exclude 'src/native/' --exclude '.git/' --exclude 'gluegen-java-src.zip' \${line.separator} ${env.HOST_UID}@${env.HOST_IP}::${env.HOST_RSYNC_ROOT}/gluegen ${env.TARGET_ROOT} ${line.separator} cd ${env.TARGET_ROOT}/gluegen/make ${line.separator} export ${system.env.library.path}=${env.TARGET_ROOT}/gluegen/${rootrel.build}/obj:${env.TARGET_ROOT}/gluegen/${rootrel.build}/test/build/natives ${line.separator} |