Skip to content

Commit

Permalink
Merge SVN 4969
Browse files Browse the repository at this point in the history
  • Loading branch information
ddeclerck committed Sep 13, 2024
1 parent 57b4503 commit 5ce3f69
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
16 changes: 8 additions & 8 deletions tests/testsuite.src/configuration.at
Original file line number Diff line number Diff line change
Expand Up @@ -658,11 +658,11 @@ AT_SETUP([runtime configuration: entries])
AT_KEYWORDS([configuration misc])

AT_CHECK([echo "$PATHSEP"], [0], [;
], [],
], [], [

# Previous test "failed" --> PATHSEP isn't ;

AT_DATA([defunc.cfg], [
AT_DATA([defunc.cfg], [
novar
physical_cancel notwithme
load_case insensitive
Expand All @@ -675,7 +675,7 @@ trace_file /tmp:/temp
])

# conf entries must be clean
AT_CHECK([$COBCRUN -c defunc.cfg --runtime-conf], [1], [],
AT_CHECK([$COBCRUN -c defunc.cfg --runtime-conf], [1], [],
[configuration error:
defunc.cfg:2: unknown configuration tag 'novar'
defunc.cfg:3: invalid value 'notwithme' for configuration tag 'physical_cancel';
Expand All @@ -693,12 +693,12 @@ defunc.cfg:9: WARNING - 'sort_chunk' without a value - ignored!
defunc.cfg:10: invalid value '/tmp:/temp' for configuration tag 'trace_file';
should not contain ':'
])

]
,

[
# Previous test "passed" --> PATHSEP is ;

AT_DATA([defunc.cfg], [
AT_DATA([defunc.cfg], [
novar
physical_cancel notwithme
load_case insensitive
Expand All @@ -711,7 +711,7 @@ trace_file C:\tmp;C:\temp
])

# conf entries must be clean
AT_CHECK([$COBCRUN -c defunc.cfg --runtime-conf], [1], [],
AT_CHECK([$COBCRUN -c defunc.cfg --runtime-conf], [1], [],
[configuration error:
defunc.cfg:2: unknown configuration tag 'novar'
defunc.cfg:3: invalid value 'notwithme' for configuration tag 'physical_cancel';
Expand All @@ -729,7 +729,7 @@ defunc.cfg:9: WARNING - 'sort_chunk' without a value - ignored!
defunc.cfg:10: invalid value 'C:\tmp;C:\temp' for configuration tag 'trace_file';
should not contain ';'
])

]
)

AT_CLEANUP
Expand Down
6 changes: 4 additions & 2 deletions tests/testsuite.src/run_file.at
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ AT_DATA([prog.cob], [

AT_CHECK([$COMPILE prog.cob], [0], [], [])
AT_CHECK([$COBCRUN_DIRECT ./prog], [0], [], [])
[echo "Test" > ./nosubhere]
AT_DATA([nosubhere], [Test
])
AT_CHECK([$COBCRUN_DIRECT ./prog], [0], [], [])

AT_CLEANUP
Expand Down Expand Up @@ -371,7 +372,8 @@ AT_CHECK([$COMPILE prog.cob], [0], [], [])
AT_CHECK([$COBCRUN_DIRECT ./prog], [0],
[STATUS OPENO 35
], [])
[echo "Test" > ./nosubhere]
AT_DATA([nosubhere], [Test
])
AT_CHECK([$COBCRUN_DIRECT ./prog], [0],
[STATUS OPENO 30
], [])
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite.src/syn_misc.at
Original file line number Diff line number Diff line change
Expand Up @@ -9564,7 +9564,7 @@ AT_DATA([fixed2.cob], [
])

# Generate source files with DOM
AT_CHECK([printf '\xEF\xBB\xBF' > header.dom])
AT_CHECK([printf '\357\273\277' > header.dom])
AT_CHECK([cat header.dom free.cob >> domfree.cob])
AT_CHECK([cat header.dom fixed1.cob >> domfixed.cob])

Expand Down

0 comments on commit 5ce3f69

Please sign in to comment.