Skip to content

Commit 6b6abb2

Browse files
committed
Merge commit '28b04a99d69a56960e53410e99de93115015061f'
2 parents 08ba646 + 28b04a9 commit 6b6abb2

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

tests/jp-compat

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10106,18 +10106,29 @@ $at_failed && at_fn_log_failure
1010610106
$at_traceon; }
1010710107

1010810108
{ set +x
10109-
$as_echo "$at_srcdir/system-routine.at:85: ./prog"
10109+
$as_echo "$at_srcdir/system-routine.at:85: ./prog > list2"
1011010110
at_fn_check_prepare_trace "system-routine.at:85"
10111-
( $at_check_trace; ./prog
10111+
( $at_check_trace; ./prog > list2
1011210112
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
1011310113
at_status=$? at_failed=false
1011410114
$at_check_filter
1011510115
at_fn_diff_devnull "$at_stderr" || at_failed=:
10116-
echo >>"$at_stdout"; $as_echo "`cat list1`
10117-
" | \
10118-
$at_diff - "$at_stdout" || at_failed=:
10116+
at_fn_diff_devnull "$at_stdout" || at_failed=:
1011910117
at_fn_check_status 0 $at_status "$at_srcdir/system-routine.at:85"
1012010118
$at_failed && at_fn_log_failure
10119+
$at_traceon; }
10120+
10121+
{ set +x
10122+
$as_echo "$at_srcdir/system-routine.at:86: diff list1 list2"
10123+
at_fn_check_prepare_trace "system-routine.at:86"
10124+
( $at_check_trace; diff list1 list2
10125+
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
10126+
at_status=$? at_failed=false
10127+
$at_check_filter
10128+
at_fn_diff_devnull "$at_stderr" || at_failed=:
10129+
at_fn_diff_devnull "$at_stdout" || at_failed=:
10130+
at_fn_check_status 0 $at_status "$at_srcdir/system-routine.at:86"
10131+
$at_failed && at_fn_log_failure
1012110132
$at_traceon; }
1012210133

1012310134
set +x

tests/jp-compat.src/system-routine.at

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ AT_CHECK([echo -n 1 >list/input1.txt])
8282
AT_CHECK([echo -n 1 >list/input2.txt])
8383
AT_CHECK([ls -1f list > list1])
8484
AT_CHECK([${COMPILE} prog.cob])
85-
AT_CHECK_UNQUOTED([./prog], [0],
86-
[`cat list1`]
87-
)
85+
AT_CHECK([./prog > list2])
86+
AT_CHECK([diff list1 list2], [0],[])
8887
AT_CLEANUP
8988

0 commit comments

Comments
 (0)