Fixed linking issue concerning test suites.
authorMarkus Kauppila
Wed, 20 Jul 2011 23:37:58 +0300
changeset 5777e52f6ba69eef
parent 5776 32a61ad9ac1a
child 5778 0d1c4a7773b1
Fixed linking issue concerning test suites.
Fixed linux build (it compiles and runs properly).
test/test-automation/Makefile.am
test/test-automation/configure.ac
test/test-automation/testaudio/Makefile.am
test/test-automation/testdummy/Makefile.am
test/test-automation/testdummy/testdummy.c
test/test-automation/testplatform/Makefile.am
test/test-automation/testrect/Makefile.am
test/test-automation/testsurface/Makefile.am
     1.1 --- a/test/test-automation/Makefile.am	Wed Jul 20 19:57:42 2011 +0300
     1.2 +++ b/test/test-automation/Makefile.am	Wed Jul 20 23:37:58 2011 +0300
     1.3 @@ -14,6 +14,10 @@
     1.4  libtest_la_CLAGS = -fPIC -g
     1.5  libtest_la_LDFLAGS = `sdl-config --libs`
     1.6  
     1.7 +libtest: libtest.la
     1.8 +		echo "Test library compiled."
     1.9 +
    1.10 +all-local: install-tests
    1.11  install: install-tests
    1.12  install-tests:
    1.13  	$(SHELL) build-scripts/install-tests.sh
     2.1 --- a/test/test-automation/configure.ac	Wed Jul 20 19:57:42 2011 +0300
     2.2 +++ b/test/test-automation/configure.ac	Wed Jul 20 23:37:58 2011 +0300
     2.3 @@ -44,4 +44,4 @@
     2.4  echo "========================================"
     2.5  echo ""
     2.6  echo "./configure ready!"
     2.7 -echo "you're ready to run: 'make && make install'"
     2.8 +echo "you're ready to run: 'make libtest && make'"
     3.1 --- a/test/test-automation/testaudio/Makefile.am	Wed Jul 20 19:57:42 2011 +0300
     3.2 +++ b/test/test-automation/testaudio/Makefile.am	Wed Jul 20 23:37:58 2011 +0300
     3.3 @@ -1,4 +1,4 @@
     3.4  lib_LTLIBRARIES = libtestaudio.la
     3.5 -libtestaudio_la_SOURCES = testaudio.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
     3.6 +libtestaudio_la_SOURCES = testaudio.c
     3.7  libtestaudio_la_CLAGS = -fPIC -g
     3.8 -libtestaudio_la_LDFLAGS = `sdl-config --libs`
     3.9 +libtestaudio_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
     4.1 --- a/test/test-automation/testdummy/Makefile.am	Wed Jul 20 19:57:42 2011 +0300
     4.2 +++ b/test/test-automation/testdummy/Makefile.am	Wed Jul 20 23:37:58 2011 +0300
     4.3 @@ -1,5 +1,4 @@
     4.4  lib_LTLIBRARIES = libtestdummy.la
     4.5  libtestdummy_la_SOURCES = testdummy.c 
     4.6  libtestdummy_la_CLAGS = -fPIC -g
     4.7 -libtestdummy_la_LIBADD = ../libtest.la
     4.8 -libtestdummy_la_LDFLAGS = `sdl-config --libs`
     4.9 +libtestdummy_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
     5.1 --- a/test/test-automation/testdummy/testdummy.c	Wed Jul 20 19:57:42 2011 +0300
     5.2 +++ b/test/test-automation/testdummy/testdummy.c	Wed Jul 20 23:37:58 2011 +0300
     5.3 @@ -95,7 +95,7 @@
     5.4  dummycase2(void *arg)
     5.5  {
     5.6  	char *msg = "eello";
     5.7 -	msg[0] = 'H';
     5.8 +	//msg[0] = 'H';
     5.9  	AssertTrue(1, "Assert message");
    5.10  }
    5.11  
     6.1 --- a/test/test-automation/testplatform/Makefile.am	Wed Jul 20 19:57:42 2011 +0300
     6.2 +++ b/test/test-automation/testplatform/Makefile.am	Wed Jul 20 23:37:58 2011 +0300
     6.3 @@ -1,4 +1,4 @@
     6.4  lib_LTLIBRARIES = libtestplatform.la
     6.5 -libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
     6.6 +libtestplatform_la_SOURCES = testplatform.c
     6.7  libtestplatform_la_CLAGS = -fPIC -g
     6.8 -libtestplatform_la_LDFLAGS = `sdl-config --libs`
     6.9 +libtestplatform_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
     7.1 --- a/test/test-automation/testrect/Makefile.am	Wed Jul 20 19:57:42 2011 +0300
     7.2 +++ b/test/test-automation/testrect/Makefile.am	Wed Jul 20 23:37:58 2011 +0300
     7.3 @@ -1,4 +1,4 @@
     7.4  lib_LTLIBRARIES = libtestrect.la
     7.5 -libtestrect_la_SOURCES = testrect.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
     7.6 +libtestrect_la_SOURCES = testrect.c
     7.7  libtestrect_la_CLAGS = -fPIC -g
     7.8 -libtestrect_la_LDFLAGS = `sdl-config --libs`
     7.9 +libtestrect_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
     8.1 --- a/test/test-automation/testsurface/Makefile.am	Wed Jul 20 19:57:42 2011 +0300
     8.2 +++ b/test/test-automation/testsurface/Makefile.am	Wed Jul 20 23:37:58 2011 +0300
     8.3 @@ -1,5 +1,4 @@
     8.4  lib_LTLIBRARIES = libtestsurface.la
     8.5 -libtestsurface_la_SOURCES = testsurface.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c \
     8.6 -	../common/common.c ../common/img_blit.c ../common/img_blitblend.c ../common/img_face.c ../common/img_primitives.c ../common/img_primitivesblend.c
     8.7 +libtestsurface_la_SOURCES = testsurface.c
     8.8  libtestsurface_la_CLAGS = -fPIC -g
     8.9 -libtestsurface_la_LDFLAGS = `sdl-config --libs`
    8.10 +libtestsurface_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la