Skip to content

Commit

Permalink
Bump version numbers of DTD files for benchmark definitions and results
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilippWendler committed Feb 11, 2019
1 parent 6e2ecde commit b16520a
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions benchexec/outputhandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
from benchexec import result
from benchexec import util

RESULT_XML_PUBLIC_ID = '+//IDN sosy-lab.org//DTD BenchExec result 1.9//EN'
RESULT_XML_SYSTEM_ID = 'https://www.sosy-lab.org/benchexec/result-1.9.dtd'
RESULT_XML_PUBLIC_ID = '+//IDN sosy-lab.org//DTD BenchExec result 1.18//EN'
RESULT_XML_SYSTEM_ID = 'https://www.sosy-lab.org/benchexec/result-1.18.dtd'

# colors for column status in terminal
COLOR_GREEN = "\033[32;1m{0}\033[m"
Expand Down
2 changes: 1 addition & 1 deletion benchexec/test_integration/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
benchmarks_dir = here
benchexec = os.path.join(bin_dir, 'benchexec')
result_dtd = os.path.join(base_dir, 'doc', 'result.dtd')
result_dtd_public_id = '+//IDN sosy-lab.org//DTD BenchExec result 1.9//EN'
result_dtd_public_id = '+//IDN sosy-lab.org//DTD BenchExec result 1.18//EN'

benchmark_test_name = 'benchmark-example-rand'
benchmark_test_file = os.path.join(here, 'benchmark-example-rand.xml')
Expand Down
2 changes: 1 addition & 1 deletion doc/benchexec.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and [doc/benchmark-example-cbmc.xml](benchmark-example-cbmc.xml).
The document type of these files should be

```XML
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.17//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.17.dtd">
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.18//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.18.dtd">
```

A document-type definition with a formal specification of input files can be found in
Expand Down
2 changes: 1 addition & 1 deletion doc/benchmark-example-calculatepi.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.17//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.17.dtd">
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.18//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.18.dtd">
<!-- Example file for benchmark definition for BenchExec
with dummy tool "calculatepi" that calculates Pi up to some number of digits. -->
<benchmark displayName="Calculate Pi" tool="calculatepi" timelimit="900s" memlimit="100 MB" cpuCores="1">
Expand Down
2 changes: 1 addition & 1 deletion doc/benchmark-example-cbmc.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.17//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.17.dtd">
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.18//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.18.dtd">
<!-- Example file for benchmark definition for BenchExec,
using tool "cbmc" with a CPU time limit of 60s,
1000 MB of RAM, and 1 CPU core.
Expand Down
2 changes: 1 addition & 1 deletion doc/benchmark-example-rand.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.17//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.17.dtd">
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.18//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.18.dtd">
<!-- Example file for benchmark definition for BenchExec
with dummy tool that simply returns random answers.
No resource limits are specified. -->
Expand Down
2 changes: 1 addition & 1 deletion doc/benchmark-example-true.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.17//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.17.dtd">
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.18//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.18.dtd">
<!-- Example file for benchmark definition for BenchExec
with dummy tool that simply returns TRUE.
No resource limits are specified. -->
Expand Down
2 changes: 1 addition & 1 deletion doc/benchmark.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.17//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.17.dtd">
<!DOCTYPE benchmark PUBLIC "+//IDN sosy-lab.org//DTD BenchExec benchmark 1.18//EN" "https://www.sosy-lab.org/benchexec/benchmark-1.18.dtd">
<!-- Example file for benchmark definition for BenchExec. -->
<benchmark tool="*tool to benchmark (name of tool-info module for BenchExec)*"
displayName="*human-readable name as description of this benchmark*"
Expand Down

0 comments on commit b16520a

Please sign in to comment.