Reorganizing the project.

libsdl-org · Aug 6, 2011 · badc7e0 · badc7e0
1 parent 6ccaec1
commit badc7e0
Show file tree

Hide file tree

Showing 47 changed files with 61 additions and 579 deletions.
diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am
@@ -1,31 +1,19 @@
 ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
 
-SUBDIRS = testdummy testrect testplatform testaudio testsurface testrwops testrender
-runnerdir = .
-
-bin_PROGRAMS = runner
-runner_SOURCES = runner.c support.c
-##nobase_runner_HEADERS = fuzzer.h logger.h plain_logger.h  xml_logger.h xml.h
-runner_CLAGS = -W -Wall -Wextra -g `sdl-config --cflags` -DSDL_NO_COMPAT
-runner_LDADD = libtest.la
-runner_LDFLAGS = `sdl-config --libs`
-## -I .libs/libtest.so
-
-lib_LTLIBRARIES = libtest.la
-libtest_la_SOURCES = SDL_test.c logger_helpers.c plain_logger.c xml_logger.c xml.c \
-	common/common.c common/img_blit.c common/img_blitblend.c common/img_face.c common/img_primitives.c common/img_primitivesblend.c \
-	fuzzer/utl_crc32.c fuzzer/utl_md5.c fuzzer/utl_random.c fuzzer/fuzzer.c
-libtest_la_CLAGS = -fPIC -g
-libtest_la_LDFLAGS = `sdl-config --libs`
-
-libtest: libtest.la
-	echo "Test library compiled."
+SUBDIRS = src/libtest src/runner \
+		  tests/testdummy \
+		  tests/testrect \
+		  tests/testplatform \
+		  tests/testaudio \
+		  tests/testsurface \
+		  tests/testrwops \
+		  tests/testrender
 
 all-local: install-tests
 install: install-tests
 install-tests:
 	$(SHELL) build-scripts/install-tests.sh
 
+clean:
 clean-local:
-	-rm -Rf tests/ docs/
-
+	echo "clean-local is obsolete"
diff --git a/test/test-automation/build-scripts/install-tests.sh b/test/test-automation/build-scripts/install-tests.sh
@@ -5,7 +5,7 @@ EXT="error"
 
 #echo "Installing test suites to $DIRECTORY" 
 
-rm -Rfv $DIRECTORY > /dev/null 2>&1
+#rm -Rfv $DIRECTORY/ > /dev/null 2>&1
 mkdir $DIRECTORY > /dev/null 2>&1
 
 PLATFORM="$(uname)"
@@ -18,7 +18,7 @@ fi
 # TODO: put the test in an array
 for suite in "testdummy" "testplatform" "testrect" "testaudio" "testsurface" "testrwops" "testrender"
 do
-	cp -f "$suite/.libs/lib$suite.$EXT" $DIRECTORY
+	cp -f "$DIRECTORY/$suite/.libs/lib$suite.$EXT" $DIRECTORY
 done
 
 #sudo cp .libs/libtest.0.dylib /usr/local/lib/libtest.0.dylib

diff --git a/test/test-automation/configure.ac b/test/test-automation/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.65])
 AC_INIT([runner], [0.01], [markus.kauppila@gmail.com])
-AC_CONFIG_SRCDIR([runner.c])
+AC_CONFIG_SRCDIR([src/runner/runner.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR(acinclude)
 AC_CONFIG_AUX_DIR(build-scripts)
@@ -33,13 +33,15 @@ CFLAGS="-g"
 AC_FUNC_FORK
 
 AC_CONFIG_FILES([Makefile
-				 testdummy/Makefile 
-				 testrect/Makefile
-				 testplatform/Makefile
-				 testaudio/Makefile
-				 testsurface/Makefile
-				 testrwops/Makefile
-				 testrender/Makefile])
+				 src/runner/Makefile
+				 src/libtest/Makefile
+				 tests/testdummy/Makefile 
+				 tests/testrect/Makefile
+				 tests/testplatform/Makefile
+				 tests/testaudio/Makefile
+				 tests/testsurface/Makefile
+				 tests/testrwops/Makefile
+				 tests/testrender/Makefile])
 
 AC_OUTPUT
 

diff --git a/test/test-automation/SDL_test.h → test/test-automation/include/SDL_test.h b/test/test-automation/SDL_test.h → test/test-automation/include/SDL_test.h
@@ -21,12 +21,11 @@
 #ifndef _SDL_TEST_H
 #define _SDL_TEST_H
 
-#include "logger.h"
+#include "../src/runner/logger.h"
 
-#include "common/common.h"
-#include "common/images.h"
-
-#include "fuzzer/fuzzer.h"
+#include "../src/libtest/common/common.h"
+#include "../src/libtest/common/images.h"
+#include "../src/libtest/fuzzer/fuzzer.h"
 
 #define TEST_ENABLED  1
 #define TEST_DISABLED 0

diff --git a/test/test-automation/SDL_test.c → test/test-automation/src/libtest/SDL_test.c b/test/test-automation/SDL_test.c → test/test-automation/src/libtest/SDL_test.c
@@ -24,10 +24,12 @@
 
 #include <SDL/SDL_stdinc.h>
 
-#include "logger.h"
 #include "fuzzer/fuzzer.h"
 
-#include "SDL_test.h"
+#include "../runner/logger.h"
+
+#include "../../include/SDL_test.h"
+
 
 /*! \brief return value of test case. Non-zero value means that the test failed */
 int _testReturnValue;

diff --git a/test/test-automation/common/common.c → ...st-automation/src/libtest/common/common.c b/test/test-automation/common/common.c → ...st-automation/src/libtest/common/common.c
diff --git a/test/test-automation/common/common.h → ...st-automation/src/libtest/common/common.h b/test/test-automation/common/common.h → ...st-automation/src/libtest/common/common.h
diff --git a/test/test-automation/common/images.h → ...st-automation/src/libtest/common/images.h b/test/test-automation/common/images.h → ...st-automation/src/libtest/common/images.h
diff --git a/test/test-automation/common/img_blit.c → ...-automation/src/libtest/common/img_blit.c b/test/test-automation/common/img_blit.c → ...-automation/src/libtest/common/img_blit.c
diff --git a/test/test-automation/common/img_blitblend.c → ...mation/src/libtest/common/img_blitblend.c b/test/test-automation/common/img_blitblend.c → ...mation/src/libtest/common/img_blitblend.c
diff --git a/test/test-automation/common/img_face.c → ...-automation/src/libtest/common/img_face.c b/test/test-automation/common/img_face.c → ...-automation/src/libtest/common/img_face.c
diff --git a/test/test-automation/common/img_primitives.c → ...ation/src/libtest/common/img_primitives.c b/test/test-automation/common/img_primitives.c → ...ation/src/libtest/common/img_primitives.c
diff --git a/...t-automation/common/img_primitivesblend.c → .../src/libtest/common/img_primitivesblend.c b/...t-automation/common/img_primitivesblend.c → .../src/libtest/common/img_primitivesblend.c
diff --git a/test/test-automation/fuzzer/fuzzer.c → ...st-automation/src/libtest/fuzzer/fuzzer.c b/test/test-automation/fuzzer/fuzzer.c → ...st-automation/src/libtest/fuzzer/fuzzer.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../SDL_test.h"
+#include "../../../include/SDL_test.h"
 
 #include "fuzzer.h"
 

diff --git a/test/test-automation/fuzzer/fuzzer.h → ...st-automation/src/libtest/fuzzer/fuzzer.h b/test/test-automation/fuzzer/fuzzer.h → ...st-automation/src/libtest/fuzzer/fuzzer.h
diff --git a/test/test-automation/fuzzer/utl_crc32.c → ...automation/src/libtest/fuzzer/utl_crc32.c b/test/test-automation/fuzzer/utl_crc32.c → ...automation/src/libtest/fuzzer/utl_crc32.c
diff --git a/test/test-automation/fuzzer/utl_crc32.h → ...automation/src/libtest/fuzzer/utl_crc32.h b/test/test-automation/fuzzer/utl_crc32.h → ...automation/src/libtest/fuzzer/utl_crc32.h
diff --git a/test/test-automation/fuzzer/utl_md5.c → ...t-automation/src/libtest/fuzzer/utl_md5.c b/test/test-automation/fuzzer/utl_md5.c → ...t-automation/src/libtest/fuzzer/utl_md5.c
diff --git a/test/test-automation/fuzzer/utl_md5.h → ...t-automation/src/libtest/fuzzer/utl_md5.h b/test/test-automation/fuzzer/utl_md5.h → ...t-automation/src/libtest/fuzzer/utl_md5.h
diff --git a/test/test-automation/fuzzer/utl_random.c → ...utomation/src/libtest/fuzzer/utl_random.c b/test/test-automation/fuzzer/utl_random.c → ...utomation/src/libtest/fuzzer/utl_random.c
diff --git a/test/test-automation/fuzzer/utl_random.h → ...utomation/src/libtest/fuzzer/utl_random.h b/test/test-automation/fuzzer/utl_random.h → ...utomation/src/libtest/fuzzer/utl_random.h
diff --git a/test/test-automation/logger_helpers.c → ...t-automation/src/libtest/logger_helpers.c b/test/test-automation/logger_helpers.c → ...t-automation/src/libtest/logger_helpers.c
diff --git a/test/test-automation/logger_helpers.h → ...t-automation/src/libtest/logger_helpers.h b/test/test-automation/logger_helpers.h → ...t-automation/src/libtest/logger_helpers.h
diff --git a/test/test-automation/plain_logger.c → ...est-automation/src/libtest/plain_logger.c b/test/test-automation/plain_logger.c → ...est-automation/src/libtest/plain_logger.c
@@ -4,10 +4,12 @@
 
 #include "stdio.h"
 
-#include "Logger.h"
+#include "../../include/SDL_test.h"
+
+#include "../runner/logger.h"
+
 #include "logger_helpers.h"
 #include "plain_logger.h"
-#include "SDL_test.h"
 
 /*! Current indentationt level */
 static int indentLevel;

diff --git a/test/test-automation/plain_logger.h → ...est-automation/src/libtest/plain_logger.h b/test/test-automation/plain_logger.h → ...est-automation/src/libtest/plain_logger.h
@@ -1,8 +1,8 @@
 #ifndef _PLAIN_LOGGER_H
 #define _PLAIN_LOGGER_H
 
-#include "logger.h"
 #include <SDL/SDL_stdinc.h>
+#include "../runner/logger.h"
 
 
 /*!

diff --git a/test/test-automation/xml.c → test/test-automation/src/libtest/xml.c b/test/test-automation/xml.c → test/test-automation/src/libtest/xml.c
diff --git a/test/test-automation/xml.h → test/test-automation/src/libtest/xml.h b/test/test-automation/xml.h → test/test-automation/src/libtest/xml.h
@@ -21,8 +21,6 @@
 #ifndef _XML_H
 #define _XML_H
 
-#include "logger.h"
-
 /*! Defines attribute for XML elements */
 typedef struct Attribute {
 	const char *attribute;

diff --git a/test/test-automation/xml_logger.c → .../test-automation/src/libtest/xml_logger.c b/test/test-automation/xml_logger.c → .../test-automation/src/libtest/xml_logger.c
@@ -24,11 +24,12 @@
 
 #include <SDL/SDL.h>
 
-#include "Logger.h"
+#include "../../include/SDL_test.h"
+
+#include "../runner/logger.h"
+
 #include "xml.h"
 #include "logger_helpers.h"
-#include "SDL_test.h"
-
 #include "xml_logger.h"
 
 /*! Static strings for XML elements */

diff --git a/test/test-automation/xml_logger.h → .../test-automation/src/libtest/xml_logger.h b/test/test-automation/xml_logger.h → .../test-automation/src/libtest/xml_logger.h
@@ -3,7 +3,7 @@
 
 #include <SDL/SDL_stdinc.h>
 
-#include "logger.h"
+#include "../runner/logger.h"
 
 /*!
  * Prints out information about starting the test run in XML

diff --git a/test/test-automation/logger.h → test/test-automation/src/runner/logger.h b/test/test-automation/logger.h → test/test-automation/src/runner/logger.h
diff --git a/test/test-automation/runner.c → test/test-automation/src/runner/runner.c b/test/test-automation/runner.c → test/test-automation/src/runner/runner.c
@@ -29,14 +29,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "fuzzer/fuzzer.h"
+#include "../../include/SDL_test.h"
+#include "../../config.h"
 
-#include "config.h"
+#include "../libtest/fuzzer/fuzzer.h"
 
-#include "SDL_test.h"
+#include "../libtest/plain_logger.h"
+#include "../libtest/xml_logger.h"
 
-#include "plain_logger.h"
-#include "xml_logger.h"
 #include "logger.h"
 #include "support.h"
 
@@ -228,7 +228,7 @@ ScanForTestSuites(char *directoryName, char *extension)
 	directory = opendir(directoryName);
 	if(!directory) {
 		fprintf(stderr, "Failed to open test suite directory: %s\n", directoryName);
-		perror("Error message: ");
+		perror("Error message");
 		exit(2);
 	}
 

diff --git a/test/test-automation/support.c → test/test-automation/src/runner/support.c b/test/test-automation/support.c → test/test-automation/src/runner/support.c
diff --git a/test/test-automation/support.h → test/test-automation/src/runner/support.h b/test/test-automation/support.h → test/test-automation/src/runner/support.h