File tree Expand file tree Collapse file tree 4 files changed +6
-3
lines changed Expand file tree Collapse file tree 4 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ set(diffcmd "diff -up")
26
26
27
27
# eliminate csdiff's version string in the output
28
28
set (jsfilter "sed -e 's|\" version\" : \" [^\" ]*\" |\" version\" : \"\" |g'" )
29
+ set (jsfilter "${jsfilter} -e 's|${CMAKE_SOURCE_DIR} /tests/csfilter-kfp/|\$ PROJECT_ROOT/tests/csfilter-kfp/|'" )
29
30
30
31
macro (add_test_wrap test_name cmd )
31
32
add_test ("${test_name} " bash -c "${cmd} " )
Original file line number Diff line number Diff line change 16
16
"exit-code": 0,
17
17
"host": "osh-worker-001.osh-001.prod.iad2.dc.redhat.com",
18
18
"known-false-positives": "/usr/share/csmock/known-false-positives.js",
19
- "known-false-positives-dir": "/home/kdudka/git/csdiff /tests/csfilter-kfp/0001-kfp",
19
+ "known-false-positives-dir": "$PROJECT_ROOT /tests/csfilter-kfp/0001-kfp",
20
20
"known-false-positives-rpm": "known-false-positives-2.1.0.20240515.103302.g38b39b1-1.el9.noarch",
21
21
"mock-config": "fedora-rawhide-x86_64",
22
22
"project-name": "project-koku-koku-cbe5e5c3355c1e140aa1cca7377aebe09d8d8466",
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ macro(test_csfilter_kfp tst)
25
25
if (EXISTS "${test_data_prefix} -stdin.txt" )
26
26
set (cmd "${cmd} <${test_data_prefix} -stdin.txt" )
27
27
endif ()
28
- set (cmd "${cmd} | ${diffcmd} ${test_data_prefix} -stdout.txt -" )
28
+ set (cmd "${cmd} | ${jsfilter} | ${ diffcmd} ${test_data_prefix} -stdout.txt -" )
29
29
add_test_wrap ("csfilter-kfp-${tst} " "${cmd} " )
30
30
endmacro ()
31
31
Original file line number Diff line number Diff line change 2
2
3
3
# FIXME: copy-pasted from ../../CMakeLists.txt
4
4
# eliminate csdiff's version string in the output
5
- export JSFILTER_CMD=" sed -e 's|\" version\" : \" [^\" ]*\" |\" version\" : \"\" |g'"
5
+ export JSFILTER_CMD=" sed \
6
+ -e 's|\" version\" : \" [^\" ]*\" |\" version\" : \"\" |g' \
7
+ -e 's|$PROJECT_ROOT /tests/csfilter-kfp/|\$ PROJECT_ROOT/tests/csfilter-kfp/|'"
You can’t perform that action at this time.
0 commit comments