From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 27 Sep 2020 21:45:27 +0000 (+0200)
Subject: testrunner: Filter external -0X flags to preserve current default -O0
X-Git-Tag: 0.50.1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81a866d8fc462412ffab263ae3cfef8f0a3387fa;p=thirdparty%2Fvala.git

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

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index 7f38a4306..ac5ffe1ad 100755
--- 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 de45e4519..c06dda358 100755
--- 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