Permalink
Browse files

Fix the integration test suite

Make the system property org.newsclub.net.unix.library.path point to
the directory storing the junixsocket library files.
  • Loading branch information...
1 parent 65684ac commit 0ed6ce215a5eb322823c2dc03eb73c1666a1e02f @priteau priteau committed Jun 18, 2012
@@ -1,5 +1,10 @@
#!/bin/bash
+NIMBUS_SRC_REL="`dirname $0`/.."
+NIMBUS_SRC=`cd $NIMBUS_SRC_REL; pwd`
+
+NATIVELIB_DIR="$NIMBUS_SRC/lib/native"
+JAVA_OPTIONS="-Dorg.newsclub.net.unix.library.path=${NATIVELIB_DIR}"
ALL_TEST_SUITES="basic01 basic02 basic03 basic04 basic05 basic06 basic07 failure01 failure02 spot01 spot02 spot03 spot04 spot05 spot06"
@@ -71,7 +76,7 @@ for test_suite in $RUN_TEST_SUITES; do
ms_before=`python -c "import time; print int(time.time()*1000)"`
- ant -Dnimbussuites.test.reports.dir=$REPORTS_DIR -f $ANTFILE $test_suite
+ ant ${JAVA_OPTIONS} -Dnimbussuites.test.reports.dir=$REPORTS_DIR -f $ANTFILE $test_suite
RET=$?
if [ $RET -eq 0 ]; then
@@ -165,6 +165,8 @@
parallel="false">
<sysproperty key="nimbus.servicetestsuites.abspath"
value="${nimbus.suitesdir}" />
+ <sysproperty key="org.newsclub.net.unix.library.path"
+ value="${org.newsclub.net.unix.library.path}" />
<xmlfileset file="${runone.suite.file}" />
</testng>
</target>
@@ -170,9 +170,6 @@ protected void suiteSetup() throws Exception {
// directory instead of a fresh one.
this.fullWipeResetDbAndVar();
- String libNativePath = nimbusHome + "/services/lib-native";
- System.setProperty(REMOTING_NATIVE_PROPERTY, libNativePath);
-
logger.debug(LOG_SEP + "\n*** SUITE SETUP DONE (tests will begin): " +
this.getClass().getSimpleName() + LOG_SEP);
}

0 comments on commit 0ed6ce2

Please sign in to comment.