From 4cfd38e24f8af4b1300bdbb97561b4d6230e9308 Mon Sep 17 00:00:00 2001 From: Revar Desmera Date: Fri, 19 Jun 2020 23:18:04 -0700 Subject: [PATCH] Regression test CI fix. --- scripts/make_all_docs.sh | 2 +- scripts/run_tests.sh | 6 +++++- version.scad | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/make_all_docs.sh b/scripts/make_all_docs.sh index afb581c..ddd9937 100755 --- a/scripts/make_all_docs.sh +++ b/scripts/make_all_docs.sh @@ -34,7 +34,7 @@ rm -f tmpscad*.scad for lib in $PREVIEW_LIBS; do lib="$(basename $lib .scad)" mkdir -p images/$lib - if [ "$IMGGEN" != "" -a "$TESTONLY" != ""]; then + if [ "$IMGGEN" != "" -a "$TESTONLY" != "" ]; then rm -f images/$lib/*.png images/$lib/*.gif fi echo "$lib.scad" diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index c435acb..36d4cc4 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -1,6 +1,10 @@ #!/bin/bash -OPENSCAD=/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD +if [ "$(uname -s)" != "Darwin" ]; then + OPENSCAD=openscad +else + OPENSCAD=/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD +fi for testscript in tests/test_*.scad ; do repname="$(basename $testscript|sed 's/^test_//')" diff --git a/version.scad b/version.scad index 2012abe..0861752 100644 --- a/version.scad +++ b/version.scad @@ -8,7 +8,7 @@ ////////////////////////////////////////////////////////////////////// -BOSL_VERSION = [2,0,355]; +BOSL_VERSION = [2,0,356]; // Section: BOSL Library Version Functions