tests: fix csgrep/sync.sh with --filter-file tests

Related: 653f312 Resolves: #114
csutils · Mar 6, 2023 · b4a7f69 · b4a7f69
1 parent 8b908f7
commit b4a7f69
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -29,6 +29,9 @@ set(jsfilter "sed -e 's|\"version\": \"[^\"]*\"|\"version\": \"\"|g'")
 
 macro(add_test_wrap test_name cmd)
     add_test("${test_name}" bash -c "${cmd}")
+    set_tests_properties(${test_name} PROPERTIES
+        ENVIRONMENT "PROJECT_ROOT=${CMAKE_SOURCE_DIR}")
+
     set_tests_properties(${test_name} PROPERTIES COST ${test_cost})
     math(EXPR test_cost "${test_cost} - 1")
 endmacro()

diff --git a/tests/csgrep/0076-filter-file-basic-args.txt b/tests/csgrep/0076-filter-file-basic-args.txt
@@ -1 +1 @@
---remove-duplicates --filter-file ../../../tests/csgrep/0076-filter-file-basic-filter.json
+--remove-duplicates --filter-file "$PROJECT_ROOT/tests/csgrep/0076-filter-file-basic-filter.json"
diff --git a/tests/csgrep/0077-filter-file-checker-regex-args.txt b/tests/csgrep/0077-filter-file-checker-regex-args.txt
@@ -1 +1 @@
---remove-duplicates --filter-file ../../../tests/csgrep/0077-filter-file-checker-regex-filter.json
+--remove-duplicates --filter-file "$PROJECT_ROOT/tests/csgrep/0077-filter-file-checker-regex-filter.json"
diff --git a/tests/csgrep/sync.sh b/tests/csgrep/sync.sh
@@ -1,6 +1,9 @@
 #!/bin/zsh
 set -exo pipefail
 
+# set path to project root
+PROJECT_ROOT="../../"
+
 # import ${JSFILTER_CMD}
 . ../test-lib.sh
 
@@ -12,7 +15,7 @@ fi
 
 for tst in "${tests[@]}"; do
     tst=${tst%-args.txt}
-    eval "../../csdiff_build/src/csgrep $(<${tst}-args.txt) ${tst}-stdin.txt" \
+    eval "$PROJECT_ROOT/csdiff_build/src/csgrep $(<${tst}-args.txt) ${tst}-stdin.txt" \
         | eval "${JSFILTER_CMD}" \
         > ${tst}-stdout.txt
 done
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		--remove-duplicates --filter-file ../../../tests/csgrep/0076-filter-file-basic-filter.json
		--remove-duplicates --filter-file "$PROJECT_ROOT/tests/csgrep/0076-filter-file-basic-filter.json"