Skip to content

Commit 30964cd

Browse files
committed
tests: remove redundant JSON output reformatters
1 parent 295bcef commit 30964cd

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

tests/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,8 @@ set(cssort "${CMAKE_BINARY_DIR}/src/cssort")
2424
set(csjson "${csgrep} --mode=json")
2525
set(diffcmd "diff -up")
2626

27-
# unify the JSON output generated by different version of Boost
28-
set(jsfilter "sed")
29-
set(jsfilter "${jsfilter} -e ':a;N;$!ba;s|:\\\\\\\\n *\\\\\\\\[|: [|g'")
30-
3127
# eliminate csdiff's version string in the output
32-
set(jsfilter "${jsfilter} -e 's|\"version\": \"[^\"]*\"|\"version\": \"\"|g'")
33-
34-
# yet another conversion needed for scan properties on EPEL-7
35-
set(jsfilter "${jsfilter} -e ';s|:\\\\\\\\n *{|: {|g'")
28+
set(jsfilter "sed -e 's|\"version\": \"[^\"]*\"|\"version\": \"\"|g'")
3629

3730
macro(add_test_wrap test_name cmd)
3831
add_test("${test_name}" bash -c "${cmd}")

tests/test-lib.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# shellcheck shell=sh
22

33
# FIXME: copy-pasted from ../../CMakeLists.txt
4-
export JSFILTER_CMD="sed -e ':a;N;\$!ba;s|:\\n *\\[|: [|g'"
5-
64
# eliminate csdiff's version string in the output
7-
JSFILTER_CMD="${JSFILTER_CMD} -e 's|\"version\": \"[^\"]*\"|\"version\": \"\"|g'"
8-
9-
# yet another conversion needed for scan properties on EPEL-7
10-
JSFILTER_CMD="${JSFILTER_CMD}';s|:\\n *{|: {|g'"
5+
export JSFILTER_CMD="sed -e 's|\"version\": \"[^\"]*\"|\"version\": \"\"|g'"

0 commit comments

Comments
 (0)