Skip to content

Commit bf075a3

Browse files
committed
Add format-classpath script, and convert tests to use it
1 parent 5d690ec commit bf075a3

8 files changed

+16
-69
lines changed

regression/cbmc-java/overlay-class/correct-test-win.desc

Lines changed: 0 additions & 17 deletions
This file was deleted.

regression/cbmc-java/overlay-class/correct-test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE OS-LINUX OS-MACOS
22
Test.class
3-
--classpath .:annotations:correct-overlay --verbosity 10
3+
`./format_classpath.sh . annotations correct-overlay` --verbosity 10
44
^Getting class `Test' from file \./Test\.class$
55
^Getting class `Test' from file correct-overlay/Test\.class$
66
^Adding symbol from overlay class: field 'x'$

regression/cbmc-java/overlay-class/duplicate-test-win.desc

Lines changed: 0 additions & 17 deletions
This file was deleted.

regression/cbmc-java/overlay-class/duplicate-test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE OS-LINUX OS-MACOS
22
Test.class
3-
--classpath .:annotations:.:correct-overlay --verbosity 10
3+
`./format_classpath.sh . annotations . correct-overlay` --verbosity 10
44
^Getting class `Test' from file \./Test\.class$
55
^Getting class `Test' from file correct-overlay/Test\.class$
66
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
unameOut="$(uname -s)"
4+
case "${unameOut}" in
5+
CYGWIN*) separator=";";;
6+
MINGW*) separator=";";;
7+
MSYS*) separator=";";;
8+
Windows*) separator=";";;
9+
*) separator=":"
10+
esac
11+
12+
echo -n "--classpath "
13+
echo -n `IFS=$separator; echo "$*"`

regression/cbmc-java/overlay-class/misordered-test-win.desc

Lines changed: 0 additions & 16 deletions
This file was deleted.

regression/cbmc-java/overlay-class/misordered-test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE OS-LINUX OS-MACOS
22
Test.class
3-
--classpath annotations:correct-overlay:. --verbosity 10
3+
`./format_classpath.sh annotations correct-overlay .` --verbosity 10
44
^Getting class `Test' from file correct-overlay/Test\.class$
55
^Getting class `Test' from file \./Test\.class$
66
^Skipping class Test marked with OverlayClassImplementation but found before original definition$

regression/cbmc-java/overlay-class/unmarked-test-win.desc

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)