Author: philip
Date: Thu Dec 3 08:59:09 2009
New Revision: 886710
URL: http://svn.apache.org/viewvc?rev=886710&view=rev
Log:
Make the javahl tests work when builddir!=srcdir.
* Makefile.in:
Add javahl_test_srcdir and pass when invoking the tests.
[in subversion/bindings/javahl]
* tests/org/tigris/subversion/javahl/SVNAdminTests.java
(testLoadRepo): Use srcdir to load issue 2979 dump file.
Modified:
subversion/trunk/Makefile.in
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java
Modified: subversion/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=886710&r1=886709&r2=886710&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Thu Dec 3 08:59:09 2009
@@ -94,6 +94,7 @@
javahl_javahdir = @libdir@/svn-javahl/include
javahl_libdir = @libdir@
javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work
+javahl_test_srcdir=$(abs_srcdir)/subversion/bindings/javahl
MSGFMT = @MSGFMT@
MSGFMTFLAGS = @MSGFMTFLAGS@
@@ -431,7 +432,7 @@
check-javahl: javahl
@FIX_JAVAHL_LIB@
- $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)"
"-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)"
-djava.library.pa...@javahl_objdir@:$(libdir) -classpath
$(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)"
org.tigris.subversion.javahl.RunTests
+ $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)"
"-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)"
"-Dtest.fstype=$(FS_TYPE)" -djava.library.pa...@javahl_objdir@:$(libdir)
-classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH)
"-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
# "make check CLEANUP=true" will clean up directories for successful tests.
# "make check TESTS=subversion/tests/cmdline/basic_tests.py"
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java?rev=886710&r1=886709&r2=886710&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNAdminTests.java
Thu Dec 3 08:59:09 2009
@@ -102,10 +102,9 @@
0L, infoHolder[0].getLastChangedRev());
// locate dump file in test environment
- String testRoot = System.getProperty("test.rootdir",
- "subversion/bindings/javahl/test-work");
- File javahlRoot = new File(testRoot).getParentFile();
- File dump = new File(javahlRoot, "tests/data/issue2979.dump");
+ String testSrcdir = System.getProperty("test.srcdir",
+ "subversion/bindings/javahl");
+ File dump = new File(testSrcdir, "tests/data/issue2979.dump");
InputInterface input = new FileInputer(dump);
OutputInterface loadLog = new IgnoreOutputer();
admin.load(thisTest.getRepositoryPath(),
