tests/csgrep/66-json-parser-valgrind-dedup: fix for EPEL-7

Author: kdudka

tests/CMakeLists.txt

@@ -28,6 +28,9 @@ set(diffcmd     "diff -up")
 set(jsfilter "sed")
 set(jsfilter "${jsfilter} -e ':a;N;$!ba;s|:\\\\\\\\n *\\\\\\\\[|: [|g'")
 
+# yet another conversion needed for scan properties on EPEL-7
+set(jsfilter "${jsfilter} -e ';s|:\\\\\\\\n *{|: {|g'")
+
 macro(add_test_wrap test_name cmd)
     add_test("${test_name}" bash -c "${cmd}")
     set_tests_properties(${test_name} PROPERTIES COST ${test_cost})

tests/csgrep/sync.sh

@@ -1,6 +1,9 @@
 #!/bin/zsh
 set -x
 
+# import ${JSFILTER_CMD}
+. ../test-lib.sh
+
 if [[ $# -eq 0 ]]; then
     tests=( *-args.txt )
 else
@@ -9,5 +12,7 @@ fi
 
 for tst in "${tests[@]}"; do
     tst=${tst%-args.txt}
-    eval "../../csdiff_build/src/csgrep $(<${tst}-args.txt) ${tst}-stdin.txt" > ${tst}-stdout.txt
+    eval "../../csdiff_build/src/csgrep $(<${tst}-args.txt) ${tst}-stdin.txt" \
+        | eval "${JSFILTER_CMD}" \
+        > ${tst}-stdout.txt
 done

tests/cslinker/0001-smoke/runtest.sh

@@ -3,7 +3,7 @@ set -e
 set -x
 
 # import ${JSFILTER_CMD}
-. ${TEST_SRC_DIR}/../test-lib-cslinker.sh
+. ${TEST_SRC_DIR}/../../test-lib.sh
 
 # run cshtml
 "${CSLINKER_BIN}" \

tests/cslinker/0002-xml-parser/runtest.sh

@@ -3,7 +3,7 @@ set -e
 set -x
 
 # import ${JSFILTER_CMD}
-. ${TEST_SRC_DIR}/../test-lib-cslinker.sh
+. ${TEST_SRC_DIR}/../../test-lib.sh
 
 # run cshtml
 "${CSLINKER_BIN}" --quiet                                       \