testrunner: Filter external -0X flags to preserve current default -O0

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index 7f38a4306c7edb261a73b51b3e042bf0d2fe508e..ac5ffe1adc8786c797c672772194f871dadd933f 100755 (executable)
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -50,7 +50,9 @@ done
 # Incorporate the user's CFLAGS. Matters if the user decided to insert
 # -m32 in CFLAGS, for example.
 for cflag in ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
-    VALAFLAGS="${VALAFLAGS} -X ${cflag}"
+       if [[ ! $cflag =~ ^\-O[0-9]$ ]]; then
+               VALAFLAGS="${VALAFLAGS} -X ${cflag}"
+       fi
 done
 
 function testheader() {

diff --git a/valadoc/tests/testrunner.sh b/valadoc/tests/testrunner.sh
index de45e4519ed3f5e16d33f22a8a515e46f887fc68..c06dda3581b23d9e32e96b82596046e2d29353b9 100755 (executable)
--- a/valadoc/tests/testrunner.sh
+++ b/valadoc/tests/testrunner.sh
@@ -58,7 +58,9 @@ done
 # Incorporate the user's CFLAGS. Matters if the user decided to insert
 # -m32 in CFLAGS, for example.
 for cflag in ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
-    VALAFLAGS="${VALAFLAGS} -X ${cflag}"
+       if [[ ! $cflag =~ ^\-O[0-9]$ ]]; then
+               VALAFLAGS="${VALAFLAGS} -X ${cflag}"
+       fi
 done
 
 testdir=_test