diff --git a/config/caisar-detection-data.conf b/config/caisar-detection-data.conf index 3e256ed4d9d3ea6c4bbf094efa30de7eee7574ed..115dfcf1f6301aa9f014567814d86d0201f90d68 100644 --- a/config/caisar-detection-data.conf +++ b/config/caisar-detection-data.conf @@ -33,9 +33,9 @@ use_at_auto_level = 1 [ATP saver] name = "SAVer" exec = "saver" -version_switch = "2>&1 | grep Usage" -version_regexp = "\\(\\)" -version_ok = "" +version_switch = "--version 2>&1 | cat" +version_regexp = "\\(v[0-9.]+\\)" +version_ok = "v1.0" command = "%e %{svm} %{data}" driver = "caisar_drivers/saver.drv" use_at_auto_level = 1 diff --git a/tests/autodetect.t b/tests/autodetect.t index fb0fec24292057818449138350811e08b67d2375..00f7223d030bd042f6c345837b790e1c00a68a6b 100644 --- a/tests/autodetect.t +++ b/tests/autodetect.t @@ -16,7 +16,7 @@ Test autodetect 1.0.+ $ bin/saver --version - 1.0 + v1.0 $ PATH=$(pwd)/bin:$PATH @@ -24,4 +24,4 @@ Test autodetect [caisar] Alt-Ergo 2.4.0 Marabou 1.0.+ PyRAT 1.1 - SAVER 1.0 + SAVer v1.0 diff --git a/tests/bin/saver b/tests/bin/saver index 0f7abafedb4c8fb691b167b2f79565d255ebc588..749276f4982959e19e12f9ce88f2a16ea7509403 100644 --- a/tests/bin/saver +++ b/tests/bin/saver @@ -3,7 +3,7 @@ case $1 in --version) - echo "1.0" + echo "v1.0" ;; *) echo "NN: $1" diff --git a/tests/marabou.t b/tests/marabou.t index 60fc43d73c081c75b9c13098a8fb2a62fdd23961..74fe47028ce7c31fb3114245fe2dcc1d4118a09e 100644 --- a/tests/marabou.t +++ b/tests/marabou.t @@ -38,12 +38,12 @@ Test verify <autodetect>Generating strategies: <autodetect>Run: (Marabou --version) > $TMPFILE 2>&1 <autodetect>Run: (alt-ergo --version) > $TMPFILE 2>&1 - <autodetect>Run: (saver --version) > $TMPFILE 2>&1 <autodetect>Run: (pyrat.py --version) > $TMPFILE 2>&1 + <autodetect>Run: (saver --version 2>&1 | cat) > $TMPFILE 2>&1 <autodetect>Found prover Alt-Ergo version 2.4.0, OK. <autodetect>Found prover Marabou version 1.0.+, OK. <autodetect>Found prover PyRAT version 1.1, OK. - <autodetect>Found prover SAVER version 1.0, OK. + <autodetect>Found prover SAVer version v1.0, OK. <autodetect>4 prover(s) added Goal G: Unknown () diff --git a/tests/simple.t b/tests/simple.t index 554906274f27565f42f451afcbd2022431d3d327..734f4b3983a481fc746e21d138a52418330ccdfb 100644 --- a/tests/simple.t +++ b/tests/simple.t @@ -16,7 +16,7 @@ Test verify 1.0.+ $ bin/saver --version - 1.0 + v1.0 $ PATH=$(pwd)/bin:$PATH @@ -41,12 +41,12 @@ Test verify <autodetect>Generating strategies: <autodetect>Run: (Marabou --version) > $TMPFILE 2>&1 <autodetect>Run: (alt-ergo --version) > $TMPFILE 2>&1 - <autodetect>Run: (saver --version) > $TMPFILE 2>&1 <autodetect>Run: (pyrat.py --version) > $TMPFILE 2>&1 + <autodetect>Run: (saver --version 2>&1 | cat) > $TMPFILE 2>&1 <autodetect>Found prover Alt-Ergo version 2.4.0, OK. <autodetect>Found prover Marabou version 1.0.+, OK. <autodetect>Found prover PyRAT version 1.1, OK. - <autodetect>Found prover SAVER version 1.0, OK. + <autodetect>Found prover SAVer version v1.0, OK. <autodetect>4 prover(s) added Goal G: Unknown () diff --git a/tests/simple_onnx.t b/tests/simple_onnx.t index 419eb106c7814d4de1d5cdef340fd2389d0f6dbb..4cc0e8772ca6b1dacb299e143bdcc70e602f6a59 100644 --- a/tests/simple_onnx.t +++ b/tests/simple_onnx.t @@ -33,12 +33,12 @@ Test verify <autodetect>Generating strategies: <autodetect>Run: (Marabou --version) > $TMPFILE 2>&1 <autodetect>Run: (alt-ergo --version) > $TMPFILE 2>&1 - <autodetect>Run: (saver --version) > $TMPFILE 2>&1 <autodetect>Run: (pyrat.py --version) > $TMPFILE 2>&1 + <autodetect>Run: (saver --version 2>&1 | cat) > $TMPFILE 2>&1 <autodetect>Found prover Alt-Ergo version 2.4.0, OK. <autodetect>Found prover Marabou version 1.0.+, OK. <autodetect>Found prover PyRAT version 1.1, OK. - <autodetect>Found prover SAVER version 1.0, OK. + <autodetect>Found prover SAVer version v1.0, OK. <autodetect>4 prover(s) added Goal G: Unknown ()