Trying to fix linux compatibility -> libSDLtest.* is now installed

to /usr/local/lib.
libsdl-org · Aug 6, 2011 · 6c66d51 · 6c66d51
1 parent 5369c4b
commit 6c66d51
Show file tree

Hide file tree

Showing 39 changed files with 32 additions and 24 deletions.
diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
 
-SUBDIRS = src/libtest \
+SUBDIRS = src/libSDLtest \
 		  src/runner \
 		  tests/testdummy \
 		  tests/testrect \
@@ -10,7 +10,7 @@ SUBDIRS = src/libtest \
 		  tests/testrwops \
 		  tests/testrender
 
-all-local: install
+##all-local: install
 install: install-runner install-tests
 install-runner: 
 	$(SHELL) build-scripts/install-runner.sh

diff --git a/test/test-automation/build-scripts/install-runner.sh b/test/test-automation/build-scripts/install-runner.sh
@@ -3,4 +3,11 @@
 cp src/runner/.libs/runner .
 chmod u+x runner
 
+PLATFORM="$(uname)"
+if [[ $PLATFORM ==  "Linux" ]]; then
+	cp -f src/libSDLtest/.libs/libSDLtest.so.0 /usr/local/lib
+elif [[ $PLATFORM ==  "Darwin" ]]; then
+	cp -f src/libSDLtest/.libs/libSDLtest.0.dylib /usr/local/lib
+fi
+
 echo "Runner installed."
diff --git a/test/test-automation/configure.ac b/test/test-automation/configure.ac
@@ -34,7 +34,7 @@ AC_FUNC_FORK
 
 AC_CONFIG_FILES([Makefile
 				 src/runner/Makefile
-				 src/libtest/Makefile
+				 src/libSDLtest/Makefile
 				 tests/testdummy/Makefile 
 				 tests/testrect/Makefile
 				 tests/testplatform/Makefile

diff --git a/test/test-automation/include/SDL_test.h b/test/test-automation/include/SDL_test.h
@@ -23,9 +23,9 @@
 
 #include "../src/runner/logger.h"
 
-#include "../src/libtest/common/common.h"
-#include "../src/libtest/common/images.h"
-#include "../src/libtest/fuzzer/fuzzer.h"
+#include "../src/libSDLtest/common/common.h"
+#include "../src/libSDLtest/common/images.h"
+#include "../src/libSDLtest/fuzzer/fuzzer.h"
 
 #define TEST_ENABLED  1
 #define TEST_DISABLED 0

diff --git a/test/test-automation/src/libtest/Makefile.am → ...est-automation/src/libSDLtest/Makefile.am b/test/test-automation/src/libtest/Makefile.am → ...est-automation/src/libSDLtest/Makefile.am
@@ -1,5 +1,7 @@
-lib_LTLIBRARIES = libtest.la
-libtest_la_SOURCES = SDL_test.c \
+INCLUDE = -I../../include
+
+lib_LTLIBRARIES = libSDLtest.la
+libSDLtest_la_SOURCES = SDL_test.c \
 					 logger_helpers.c \
 					 plain_logger.c \
 					 xml_logger.c xml.c \
@@ -14,9 +16,8 @@ libtest_la_SOURCES = SDL_test.c \
 					 fuzzer/utl_random.c \
 					 fuzzer/fuzzer.c \
 					 ../runner/logger.h
-INCLUDE = -I../../include
-libtest_la_CLAGS = -fPIC -g
-libtest_la_LDFLAGS = `sdl-config --libs`
+libSDLtest_la_CLAGS = -fPIC -g
+libSDLtest_la_LDFLAGS = `sdl-config --libs`
 
-libtest: libtest.la
+libtest: libSDLtest.la
 	echo "Test library compiled."
diff --git a/test/test-automation/src/libtest/SDL_test.c → ...test-automation/src/libSDLtest/SDL_test.c b/test/test-automation/src/libtest/SDL_test.c → ...test-automation/src/libSDLtest/SDL_test.c
diff --git a/...st-automation/src/libtest/common/common.c → ...automation/src/libSDLtest/common/common.c b/...st-automation/src/libtest/common/common.c → ...automation/src/libSDLtest/common/common.c
diff --git a/...st-automation/src/libtest/common/common.h → ...automation/src/libSDLtest/common/common.h b/...st-automation/src/libtest/common/common.h → ...automation/src/libSDLtest/common/common.h
diff --git a/...st-automation/src/libtest/common/images.h → ...automation/src/libSDLtest/common/images.h b/...st-automation/src/libtest/common/images.h → ...automation/src/libSDLtest/common/images.h
diff --git a/...-automation/src/libtest/common/img_blit.c → ...tomation/src/libSDLtest/common/img_blit.c b/...-automation/src/libtest/common/img_blit.c → ...tomation/src/libSDLtest/common/img_blit.c
diff --git a/...mation/src/libtest/common/img_blitblend.c → ...ion/src/libSDLtest/common/img_blitblend.c b/...mation/src/libtest/common/img_blitblend.c → ...ion/src/libSDLtest/common/img_blitblend.c
diff --git a/...-automation/src/libtest/common/img_face.c → ...tomation/src/libSDLtest/common/img_face.c b/...-automation/src/libtest/common/img_face.c → ...tomation/src/libSDLtest/common/img_face.c
diff --git a/...ation/src/libtest/common/img_primitives.c → ...on/src/libSDLtest/common/img_primitives.c b/...ation/src/libtest/common/img_primitives.c → ...on/src/libSDLtest/common/img_primitives.c
diff --git a/.../src/libtest/common/img_primitivesblend.c → ...c/libSDLtest/common/img_primitivesblend.c b/.../src/libtest/common/img_primitivesblend.c → ...c/libSDLtest/common/img_primitivesblend.c
diff --git a/...st-automation/src/libtest/fuzzer/fuzzer.c → ...automation/src/libSDLtest/fuzzer/fuzzer.c b/...st-automation/src/libtest/fuzzer/fuzzer.c → ...automation/src/libSDLtest/fuzzer/fuzzer.c
diff --git a/...st-automation/src/libtest/fuzzer/fuzzer.h → ...automation/src/libSDLtest/fuzzer/fuzzer.h b/...st-automation/src/libtest/fuzzer/fuzzer.h → ...automation/src/libSDLtest/fuzzer/fuzzer.h
diff --git a/...automation/src/libtest/fuzzer/utl_crc32.c → ...omation/src/libSDLtest/fuzzer/utl_crc32.c b/...automation/src/libtest/fuzzer/utl_crc32.c → ...omation/src/libSDLtest/fuzzer/utl_crc32.c
diff --git a/...automation/src/libtest/fuzzer/utl_crc32.h → ...omation/src/libSDLtest/fuzzer/utl_crc32.h b/...automation/src/libtest/fuzzer/utl_crc32.h → ...omation/src/libSDLtest/fuzzer/utl_crc32.h
diff --git a/...t-automation/src/libtest/fuzzer/utl_md5.c → ...utomation/src/libSDLtest/fuzzer/utl_md5.c b/...t-automation/src/libtest/fuzzer/utl_md5.c → ...utomation/src/libSDLtest/fuzzer/utl_md5.c
diff --git a/...t-automation/src/libtest/fuzzer/utl_md5.h → ...utomation/src/libSDLtest/fuzzer/utl_md5.h b/...t-automation/src/libtest/fuzzer/utl_md5.h → ...utomation/src/libSDLtest/fuzzer/utl_md5.h
diff --git a/...utomation/src/libtest/fuzzer/utl_random.c → ...mation/src/libSDLtest/fuzzer/utl_random.c b/...utomation/src/libtest/fuzzer/utl_random.c → ...mation/src/libSDLtest/fuzzer/utl_random.c
diff --git a/...utomation/src/libtest/fuzzer/utl_random.h → ...mation/src/libSDLtest/fuzzer/utl_random.h b/...utomation/src/libtest/fuzzer/utl_random.h → ...mation/src/libSDLtest/fuzzer/utl_random.h
diff --git a/...t-automation/src/libtest/logger_helpers.c → ...utomation/src/libSDLtest/logger_helpers.c b/...t-automation/src/libtest/logger_helpers.c → ...utomation/src/libSDLtest/logger_helpers.c
diff --git a/...t-automation/src/libtest/logger_helpers.h → ...utomation/src/libSDLtest/logger_helpers.h b/...t-automation/src/libtest/logger_helpers.h → ...utomation/src/libSDLtest/logger_helpers.h
diff --git a/...est-automation/src/libtest/plain_logger.c → ...-automation/src/libSDLtest/plain_logger.c b/...est-automation/src/libtest/plain_logger.c → ...-automation/src/libSDLtest/plain_logger.c
diff --git a/...est-automation/src/libtest/plain_logger.h → ...-automation/src/libSDLtest/plain_logger.h b/...est-automation/src/libtest/plain_logger.h → ...-automation/src/libSDLtest/plain_logger.h
diff --git a/test/test-automation/src/libtest/xml.c → test/test-automation/src/libSDLtest/xml.c b/test/test-automation/src/libtest/xml.c → test/test-automation/src/libSDLtest/xml.c
diff --git a/test/test-automation/src/libtest/xml.h → test/test-automation/src/libSDLtest/xml.h b/test/test-automation/src/libtest/xml.h → test/test-automation/src/libSDLtest/xml.h
diff --git a/.../test-automation/src/libtest/xml_logger.c → ...st-automation/src/libSDLtest/xml_logger.c b/.../test-automation/src/libtest/xml_logger.c → ...st-automation/src/libSDLtest/xml_logger.c
diff --git a/.../test-automation/src/libtest/xml_logger.h → ...st-automation/src/libSDLtest/xml_logger.h b/.../test-automation/src/libtest/xml_logger.h → ...st-automation/src/libSDLtest/xml_logger.h
diff --git a/test/test-automation/src/runner/Makefile.am b/test/test-automation/src/runner/Makefile.am
@@ -1,7 +1,7 @@
-INCLUDE = -I../libtest -I../../include
+INCLUDE = -I../libSDLtest -I../../include
 
 bin_PROGRAMS = runner
 runner_SOURCES = runner.c support.c
-runner_LDADD = ../libtest/libtest.la
+runner_LDADD = ../libSDLtest/libSDLtest.la
 runner_CFLAGS = -W -Wall -Wextra -g `sdl-config --cflags` -DSDL_NO_COMPAT
 runner_LDFLAGS = `sdl-config --libs`
diff --git a/test/test-automation/src/runner/runner.c b/test/test-automation/src/runner/runner.c
@@ -32,10 +32,10 @@
 #include "../../include/SDL_test.h"
 #include "../../config.h"
 
-#include "../libtest/fuzzer/fuzzer.h"
+#include "../libSDLtest/fuzzer/fuzzer.h"
 
-#include "../libtest/plain_logger.h"
-#include "../libtest/xml_logger.h"
+#include "../libSDLtest/plain_logger.h"
+#include "../libSDLtest/xml_logger.h"
 
 #include "logger.h"
 #include "support.h"

diff --git a/test/test-automation/tests/testaudio/Makefile.am b/test/test-automation/tests/testaudio/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestaudio.la
 libtestaudio_la_SOURCES = testaudio.c
 libtestaudio_la_CLAGS = -fPIC -g
-libtestaudio_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
+libtestaudio_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
diff --git a/test/test-automation/tests/testdummy/Makefile.am b/test/test-automation/tests/testdummy/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestdummy.la
 libtestdummy_la_SOURCES = testdummy.c 
 libtestdummy_la_CLAGS = -fPIC -g
-libtestdummy_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
+libtestdummy_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
diff --git a/test/test-automation/tests/testplatform/Makefile.am b/test/test-automation/tests/testplatform/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestplatform.la
 libtestplatform_la_SOURCES = testplatform.c
 libtestplatform_la_CLAGS = -fPIC -g
-libtestplatform_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
+libtestplatform_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
diff --git a/test/test-automation/tests/testrect/Makefile.am b/test/test-automation/tests/testrect/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestrect.la
 libtestrect_la_SOURCES = testrect.c
 libtestrect_la_CLAGS = -fPIC -g
-libtestrect_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
+libtestrect_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
diff --git a/test/test-automation/tests/testrender/Makefile.am b/test/test-automation/tests/testrender/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestrender.la
 libtestrender_la_SOURCES = testrender.c
 libtestrender_la_CLAGS = -fPIC -g
-libtestrender_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
+libtestrender_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
diff --git a/test/test-automation/tests/testrwops/Makefile.am b/test/test-automation/tests/testrwops/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestrwops.la
 libtestrwops_la_SOURCES = testrwops.c
 libtestrwops_la_CLAGS = -fPIC -g
-libtestrwops_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
+libtestrwops_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
diff --git a/test/test-automation/tests/testsurface/Makefile.am b/test/test-automation/tests/testsurface/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestsurface.la
 libtestsurface_la_SOURCES = testsurface.c
 libtestsurface_la_CLAGS = -fPIC -g
-libtestsurface_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
+libtestsurface_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la