TestBed: merge .flags into .opts file

diff --git a/test-suite/buildtest.sh b/test-suite/buildtest.sh
index f3f88f6b8ef5bae26086cc746a2eef01cbccf6f3..1ea9bd4bffd0c36563ac3dee34b5c4330b598cc9 100755 (executable)
--- 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 (file)
index 544b285..0000000
--- 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 5dead2b53d70bb1e2a00024e57c39baf19d44eee..a5280acc17b97ae008a4490f526c21516a6d1865 100644 (file)
--- 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 (file)
index 12dcef9..0000000
--- 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 d9b2caeaf088311029989334f140546d1406c9a8..ab6d839a0de4e059d958d6e8dd9c1ac10bda6a80 100644 (file)
--- 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"