summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-16 16:17:37 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-16 16:17:37 +0300
commited93eed717eaa23543d089236ac1b09c4d152b54 (patch)
treefacab90de2525add18c26963e17f8ea76751aea8
parentfb97eb9e75af62448ec57a45f35b13541db3188b (diff)
downloadmanaplus-ed93eed717eaa23543d089236ac1b09c4d152b54.tar.gz
manaplus-ed93eed717eaa23543d089236ac1b09c4d152b54.tar.bz2
manaplus-ed93eed717eaa23543d089236ac1b09c4d152b54.tar.xz
manaplus-ed93eed717eaa23543d089236ac1b09c4d152b54.zip
From separate file test script removed unused define DEBUGBUILD and added tests with USE_X11
-rwxr-xr-xbuild/testfile.sh48
-rwxr-xr-xbuild/testfiledye.sh48
-rwxr-xr-xbuild/testfiletest.sh48
3 files changed, 78 insertions, 66 deletions
diff --git a/build/testfile.sh b/build/testfile.sh
index bfe57c9b1..d23f2ffff 100755
--- a/build/testfile.sh
+++ b/build/testfile.sh
@@ -34,28 +34,32 @@ function run {
echo >${LOGFILE}
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DENABLE_NLS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
-
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DENABLE_NLS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DENABLE_NLS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11" "$includes" "$1"
+
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DENABLE_NLS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11" "$includes" "$1"
export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
-
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11" "$includes" "$1"
+
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11" "$includes" "$1"
diff --git a/build/testfiledye.sh b/build/testfiledye.sh
index 55a6c97a0..1dc2e5f77 100755
--- a/build/testfiledye.sh
+++ b/build/testfiledye.sh
@@ -34,28 +34,32 @@ function run {
echo >${LOGFILE}
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DDYECMD" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DENABLE_NLS -DDYECMD" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
-
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DDYECMD" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DENABLE_NLS -DDYECMD" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DENABLE_NLS -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD" "$includes" "$1"
+
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DENABLE_NLS -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD" "$includes" "$1"
export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DDYECMD" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL -DDYECMD" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DDYECMD" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
-
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DDYECMD" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL -DDYECMD" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DDYECMD" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD" "$includes" "$1"
+
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DDYECMD" "$includes" "$1"
diff --git a/build/testfiletest.sh b/build/testfiletest.sh
index 9ae673a06..d11df1bee 100755
--- a/build/testfiletest.sh
+++ b/build/testfiletest.sh
@@ -34,28 +34,32 @@ function run {
echo >${LOGFILE}
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
-
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS" "$includes" "$1"
+
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS" "$includes" "$1"
export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_LIBXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
-
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
-run "-DENABLE_PUGIXML -DDEBUGBUILD -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS" "$includes" "$1"
+
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1"
+run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DUSE_X11 -DUNITTESTS" "$includes" "$1"