Skip to content

Commit 39f19be

Browse files
JasonGrossJasonGross
committed
More grep stripping for windows compat
1 parent 3e28f33 commit 39f19be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+91
-91
lines changed

‎examples/run-example-000.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${EXTRA_ARGS[@]}" 2>/dev
6262
# kludge: create the .glob file so we don't run the makefile
6363
touch "${EXAMPLE_OUTPUT%%.v}.glob"
6464
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${EXTRA_ARGS[@]}" -l - 2>&1)"
65-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
66-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
65+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
66+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
6767
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
6868
then
6969
echo "Expected a string matching:"

‎examples/run-example-012.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ echo "==================== ACTUAL ===================="
6767
echo "==================== EXPECTED_ERROR ===================="
6868
echo "${EXPECTED_ERROR}"
6969
echo "==================== EXPECTED_ERROR ===================="
70-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
71-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
70+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
71+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
7272
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
7373
then
7474
echo "Expected a string matching:"

‎examples/run-example-013.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" -R . Foo # 2>/dev/null >/
5050
# kludge: create the .glob file so we don't run the makefile
5151
touch "${EXAMPLE_OUTPUT%%.v}.glob"
5252
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" -R . Foo -l - 2>&1)"
53-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
54-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
53+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
54+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
5555
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
5656
then
5757
echo "Expected a string matching:"

‎examples/run-example-014.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" --arg=-impredicative-set
5050
# kludge: create the .glob file so we don't run the makefile
5151
touch "${EXAMPLE_OUTPUT%%.v}.glob"
5252
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" --arg=-impredicative-set 2>&1)"
53-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
54-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
53+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
54+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
5555
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
5656
then
5757
echo "Expected a string matching:"

‎examples/run-example-015.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${EXTRA_ARGS[@]}" 2>/dev
5353
# kludge: create the .glob file so we don't run the makefile
5454
touch "${EXAMPLE_OUTPUT%%.v}.glob"
5555
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${EXTRA_ARGS[@]}" 2>&1)"
56-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
57-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
56+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
57+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
5858
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
5959
then
6060
echo "Expected a string matching:"

‎examples/run-example-016.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${ARGS[@]}" 2>/dev/null
5151
# kludge: create the .glob file so we don't run the makefile
5252
touch "${EXAMPLE_OUTPUT%%.v}.glob"
5353
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${ARGS[@]}" 2>&1)"
54-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
55-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
54+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
55+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
5656
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
5757
then
5858
echo "Expected a string matching:"

‎examples/run-example-017.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${EXTRA_ARGS[@]}" 2>/dev
4848
# kludge: create the .glob file so we don't run the makefile
4949
touch "${EXAMPLE_OUTPUT%%.v}.glob"
5050
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${EXTRA_ARGS[@]}" 2>&1)"
51-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
52-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
51+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
52+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
5353
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
5454
then
5555
echo "Expected a string matching:"

‎examples/run-example-019.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${ARGS[@]}" 2>/dev/null
4646
# kludge: create the .glob file so we don't run the makefile
4747
touch "${EXAMPLE_OUTPUT%%.v}.glob"
4848
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${ARGS[@]}" 2>&1)"
49-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
50-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
49+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
50+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
5151
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
5252
then
5353
echo "Expected a string matching:"

‎examples/run-example-020.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${ARGS[@]}" 2>/dev/null
4646
# kludge: create the .glob file so we don't run the makefile
4747
touch "${EXAMPLE_OUTPUT%%.v}.glob"
4848
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${ARGS[@]}" 2>&1)"
49-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
50-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
49+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
50+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
5151
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
5252
then
5353
echo "Expected a string matching:"

‎examples/run-example-021.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ echo "y" | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${ARGS[@]}" 2>/dev/null
4646
# kludge: create the .glob file so we don't run the makefile
4747
touch "${EXAMPLE_OUTPUT%%.v}.glob"
4848
ACTUAL_PRE="$( (echo "y"; echo "y") | find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${ARGS[@]}" 2>&1)"
49-
ACTUAL_PRE_ONE_LINE="$(echo "$ACTUAL_PRE" | tr '\n' '\1' | tr -d '\r')"
50-
TEST_FOR="$(echo "$EXPECTED_ERROR" | tr '\n' '\1' | tr -d '\r')"
49+
ACTUAL_PRE_ONE_LINE="$(strip_for_grep "$ACTUAL_PRE")"
50+
TEST_FOR="$(strip_for_grep "$EXPECTED_ERROR")"
5151
if [ "$(echo "$ACTUAL_PRE_ONE_LINE" | grep -c "$TEST_FOR")" -lt 1 ]
5252
then
5353
echo "Expected a string matching:"

0 commit comments

Comments
 (0)