From b1ca78834ca5f2fcc9d78d9eb9b22abf20392ffa Mon Sep 17 00:00:00 2001 From: Andrei Karas <akaras@inbox.ru> Date: Thu, 16 Jun 2016 20:10:24 +0300 Subject: Add test with X11 and without OpenGL into per file tests. --- build/testfile.sh | 4 ++++ build/testfiledye.sh | 4 ++++ build/testfiletest.sh | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/build/testfile.sh b/build/testfile.sh index d23f2ffff..389fa20ef 100755 --- a/build/testfile.sh +++ b/build/testfile.sh @@ -40,6 +40,7 @@ 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_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_X11" "$includes" "$1" run "-DENABLE_PUGIXML -DEATHENA_SUPPORT" "$includes" "$1" run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_OPENGL" "$includes" "$1" @@ -47,6 +48,7 @@ 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" +run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_X11" "$includes" "$1" export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2" @@ -56,6 +58,7 @@ 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_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11" "$includes" "$1" run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2" "$includes" "$1" run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DUSE_OPENGL" "$includes" "$1" @@ -63,3 +66,4 @@ 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" +run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11" "$includes" "$1" diff --git a/build/testfiledye.sh b/build/testfiledye.sh index 1dc2e5f77..4be5f94ff 100755 --- a/build/testfiledye.sh +++ b/build/testfiledye.sh @@ -40,6 +40,7 @@ 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_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_X11 -DDYECMD" "$includes" "$1" run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DDYECMD" "$includes" "$1" run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_OPENGL -DDYECMD" "$includes" "$1" @@ -47,6 +48,7 @@ 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" +run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_X11 -DDYECMD" "$includes" "$1" export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2" @@ -56,6 +58,7 @@ run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DDYECMD" "$inclu 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_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -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" @@ -63,3 +66,4 @@ run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DDYECMD" "$incl 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" +run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DDYECMD" "$includes" "$1" diff --git a/build/testfiletest.sh b/build/testfiletest.sh index d11df1bee..45ab4e850 100755 --- a/build/testfiletest.sh +++ b/build/testfiletest.sh @@ -40,6 +40,7 @@ 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_LIBXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS" "$includes" "$1" run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUNITTESTS" "$includes" "$1" run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_OPENGL -DUNITTESTS" "$includes" "$1" @@ -47,6 +48,7 @@ run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DENABLE_NLS -DUNITTESTS" "$includes" "$ 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" +run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS" "$includes" "$1" export includes="-I. -I/usr/include -I/usr/include/SDL2 -I/usr/include/libxml2" @@ -56,6 +58,7 @@ run "-DENABLE_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS" "$in 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_LIBXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -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" @@ -63,3 +66,4 @@ run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DENABLE_NLS -DUNITTESTS" "$i 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" +run "-DENABLE_PUGIXML -DEATHENA_SUPPORT -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_X11 -DUNITTESTS" "$includes" "$1" -- cgit v1.2.3-70-g09d2