make all scripts find include file same way (#546)

rjust · Dec 3, 2023 · b772d87 · b772d87
1 parent 45675e0
commit b772d87
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/framework/test/test_d4j_query.sh b/framework/test/test_d4j_query.sh
@@ -4,10 +4,13 @@
 # This script runs a set of basic queries against d4j-query and checks the results
 #
 ################################################################################
-source test.include
 
 HERE=$(cd `dirname $0` && pwd)
 
+# Import helper subroutines and variables, and init Defects4J
+source "$HERE/test.include" || exit 1
+init
+
 $BASE_DIR/framework/bin/defects4j query -p Collections -H >> $HERE"/temp"
 result=`diff $HERE/temp $HERE/resources/output/d4j-query/1`
 

diff --git a/framework/test/test_gen_tests.sh b/framework/test/test_gen_tests.sh
@@ -11,8 +11,11 @@
 #   * Generate for bugs 1-10 and 20: ./test_generate_suites.sh -pLang -b1..10 -b20
 #
 ################################################################################
+
+HERE=$(cd `dirname $0` && pwd)
+
 # Import helper subroutines and variables, and init Defects4J
-source test.include
+source "$HERE/test.include" || exit 1
 init
 
 # Print usage message and exit

diff --git a/framework/test/test_sanity_check.sh b/framework/test/test_sanity_check.sh
@@ -4,8 +4,11 @@
 # This script runs the sanity check on each project version.
 #
 ################################################################################
+
+HERE=$(cd `dirname $0` && pwd)
+
 # Import helper subroutines and variables, and init Defects4J
-source test.include
+source "$HERE/test.include" || exit 1
 init
 
 for pid in Chart Closure Lang Math Time; do

diff --git a/framework/test/test_tutorial.sh b/framework/test/test_tutorial.sh
@@ -4,8 +4,11 @@
 # This script tests the tutorial as described in Defects4J's README file.
 #
 ################################################################################
+
+HERE=$(cd `dirname $0` && pwd)
+
 # Import helper subroutines and variables, and init Defects4J
-source test.include
+source "$HERE/test.include" || exit 1
 init
 
 # Get project info

diff --git a/framework/test/test_verify_bugs.sh b/framework/test/test_verify_bugs.sh
@@ -16,8 +16,11 @@
 #   * Verify bug 2 with DEBUG  ./test_verify_bugs.sh -pLang -b 2 -D
 #
 ################################################################################
+
+HERE=$(cd `dirname $0` && pwd)
+
 # Import helper subroutines and variables, and init Defects4J
-source test.include
+source "$HERE/test.include" || exit 1
 
 # Print usage message and exit
 usage() {