From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 15 Aug 2008 10:50:34 +0000 (+1200)
Subject: TestBed: merge .flags into .opts file
X-Git-Tag: SQUID_3_1_0_1~49^2~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aa334e11dcec0090d3afa274928bf31a5c068eb;p=thirdparty%2Fsquid.git

TestBed: merge .flags into .opts file
---

diff --git a/test-suite/buildtest.sh b/test-suite/buildtest.sh
index f3f88f6b8e..1ea9bd4bff 100755
--- a/test-suite/buildtest.sh
+++ b/test-suite/buildtest.sh
@@ -20,12 +20,7 @@ if test -e ${dist%%.opts}.opts ; then
 else
 	echo "BUILD: DEFAULT"
 	OPTS=""
-fi
-
-if test -f ${dist%%.opts}.flags ; then
-#	echo "DEBUG: ${dist%%.opts}.flags"
-	FLAGS=`cat ./${dist%%.opts}.flags`
-# else nothing set for flags.
+	FLAGS=""
 fi
 
 #
diff --git a/test-suite/buildtests/os-debian.flags b/test-suite/buildtests/os-debian.flags
deleted file mode 100644
index 544b285b4d..0000000000
--- a/test-suite/buildtests/os-debian.flags
+++ /dev/null
@@ -1,11 +0,0 @@
-# #!//bin/bash
-
-# Debian for some reason builds using explicit 'cc' instead of 'gcc' or automatic
-export build_alias="i486-linux-gnu"
-export CC="cc"
-export CFLAGS="-g -O2 -g -Wall -O2"
-export LDFLAGS=""
-export CPPFLAGS=""
-export CXX="g++"
-export CXXFLAGS="-g -O2 -g -Wall -O2"
-export FFLAGS="-g -O2"
diff --git a/test-suite/buildtests/os-debian.opts b/test-suite/buildtests/os-debian.opts
index 5dead2b53d..a5280acc17 100644
--- a/test-suite/buildtests/os-debian.opts
+++ b/test-suite/buildtests/os-debian.opts
@@ -1,4 +1,4 @@
-# #!/bin/bash
+#!/bin/sh
 #
 # Configure options currently used by Debian Packaged Release
 #
@@ -44,3 +44,13 @@ OPTS=" \
 	--enable-epoll \
 	--enable-linux-netfilter \
 "
+
+# Debian for some reason builds using explicit 'cc' instead of 'gcc' or automatic
+export build_alias="i486-linux-gnu"
+export CC="cc"
+export CFLAGS="-g -O2 -g -Wall -O2"
+export LDFLAGS=""
+export CPPFLAGS=""
+export CXX="g++"
+export CXXFLAGS="-g -O2 -g -Wall -O2"
+export FFLAGS="-g -O2"
diff --git a/test-suite/buildtests/os-ubuntu.flags b/test-suite/buildtests/os-ubuntu.flags
deleted file mode 100644
index 12dcef9968..0000000000
--- a/test-suite/buildtests/os-ubuntu.flags
+++ /dev/null
@@ -1,9 +0,0 @@
-# #!/bin/bash
-
-# Ubuntu for some reason built using 'cc' instead of gcc
-export CC="/usr/bin/cc"
-export CXX="g++"
-export CFLAGS="-g -O2 -g -Wall -O2"
-export CXXFLAGS="-g -O2 -g -Wall -O2"
-export CPPFLAGS=""
-export LDFLAGS="-Wl,-Bsymbolic-functions"
diff --git a/test-suite/buildtests/os-ubuntu.opts b/test-suite/buildtests/os-ubuntu.opts
index d9b2caeaf0..ab6d839a0d 100644
--- a/test-suite/buildtests/os-ubuntu.opts
+++ b/test-suite/buildtests/os-ubuntu.opts
@@ -1,4 +1,4 @@
-# #!/bin/bash
+#!/bin/sh
 #
 # Configure options currently used by Ubuntu Packaged Release
 #
@@ -44,3 +44,11 @@ OPTS=" \
 	--enable-epoll \
 	--enable-linux-netfilter \
 "
+
+# Ubuntu for some reason built using 'cc' instead of gcc
+export CC="/usr/bin/cc"
+export CXX="g++"
+export CFLAGS="-g -O2 -g -Wall -O2"
+export CXXFLAGS="-g -O2 -g -Wall -O2"
+export CPPFLAGS=""
+export LDFLAGS="-Wl,-Bsymbolic-functions"