should have correct paths now

ubccr · Mar 14, 2019 · e78ac76 · e78ac76
1 parent 9300125
commit e78ac76
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/open_xdmod/modules/xdmod/regression_tests/post_ingest_test.sh b/open_xdmod/modules/xdmod/regression_tests/post_ingest_test.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Tests that cloud ETL works after upgrade + reingestion
 
+BASEDIR=./open_xdmod/modules/xdmod/regression_tests
 REF_DIR=/var/tmp/referencedata
 last_modified_start_date=$(date +'%F %T')
 
@@ -19,14 +20,11 @@ then
     PUB="--log-junit $2/xdmod-regression-public.xml"
 fi
 
-echo "PHPUnit is: $phpunit"
-pwd
-
-REG_TEST_USER_ROLE=usr $phpunit $REGUSER ../lib/Controllers/UsageExplorerCloudPostIngestTest.php & usrpid=$!
-REG_TEST_USER_ROLE=pi $phpunit $PI ../lib/Controllers/UsageExplorerCloudPostIngestTest.php & pipid=$!
-REG_TEST_USER_ROLE=cd $phpunit $CD ../lib/Controllers/UsageExplorerCloudPostIngestTest.php & cdpid=$!
-REG_TEST_USER_ROLE=cs $phpunit $CS ../lib/Controllers/UsageExplorerCloudPostIngestTest.php & cspid=$!
-$phpunit $PUB ../lib/Controllers/UsageExplorerCloudPostIngestTest.php & pubpid=$!
+REG_TEST_USER_ROLE=usr $phpunit $REGUSER $BASEDIR/lib/Controllers/UsageExplorerCloudPostIngestTest.php & usrpid=$!
+REG_TEST_USER_ROLE=pi $phpunit $PI $BASEDIR/lib/Controllers/UsageExplorerCloudPostIngestTest.php & pipid=$!
+REG_TEST_USER_ROLE=cd $phpunit $CD $BASEDIR/lib/Controllers/UsageExplorerCloudPostIngestTest.php & cdpid=$!
+REG_TEST_USER_ROLE=cs $phpunit $CS $BASEDIR/lib/Controllers/UsageExplorerCloudPostIngestTest.php & cspid=$!
+$phpunit $PUB $BASEDIR/lib/Controllers/UsageExplorerCloudPostIngestTest.php & pubpid=$!
 
 EXIT_STATUS=0
 for pid in $usrpid $pipid $cdpid $cspid $pubpid;