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

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index 10caefe965911f559b0c40374aa876ba61855d02..1c76487def84ce082112719bdce459458a40a892 100755 (executable)
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -60,7 +60,9 @@ VAPIGENFLAGS="--vapidir $vapidir"
 # 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 5ec5d1cbaf81c1ced9bc420f031fbfae256f4e6d..fa4852257e53d209668558bac78a877cb4078ece 100755 (executable)
--- a/valadoc/tests/testrunner.sh
+++ b/valadoc/tests/testrunner.sh
@@ -68,7 +68,9 @@ VALAFLAGS="$VALAFLAGS \
 # 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