change example to sort, and move to test directory

Author: mgates3

.gitignore

@@ -11,7 +11,6 @@ build*
 config/compiler_cxx
 config/log.txt
 config/openmp
-example
 docs/doxygen/errors.txt
 docs/html/
 files.txt
@@ -23,5 +22,6 @@ lib/*.so
 lib/pkgconfig/*.pc
 make.inc
 test/tester
+test/out
 testsweeper-*
 wiki/

CMakeLists.txt

@@ -134,38 +134,7 @@ endif()
 
 #-------------------------------------------------------------------------------
 if (build_tests)
-    # Compile example.
-    set( example ${testsweeper_}example )
-    add_executable( ${example} example.cc )
-    target_link_libraries( ${example} testsweeper )
-    set_target_properties( ${example} PROPERTIES CXX_EXTENSIONS false )
-
-    enable_testing()
-
-    add_test( NAME ${example} COMMAND ${example} )
-    set_tests_properties(
-        ${example} PROPERTIES PASS_REGULAR_EXPRESSION "Usage:" )
-
-    add_test( NAME ${example}_foo COMMAND ${example} foo )
-    set_tests_properties(
-        ${example}_foo PROPERTIES PASS_REGULAR_EXPRESSION "All tests passed" )
-
-    # Copy test script to build directory.
-    add_custom_command(
-        TARGET testsweeper POST_BUILD
-        COMMAND
-        cp -a ${CMAKE_CURRENT_SOURCE_DIR}/test
-              ${CMAKE_CURRENT_BINARY_DIR}/test
-    )
-
-    if (testsweeper_is_project)
-        add_custom_target(
-            "check"
-            COMMAND
-                python run_tests.py
-            WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test"
-        )
-    endif()
+    add_subdirectory( test )
 endif()
 
 #-------------------------------------------------------------------------------

GNUmakefile

@@ -65,11 +65,11 @@ lib_src  = testsweeper.cc version.cc
 lib_obj  = $(addsuffix .o, $(basename $(lib_src)))
 dep     += $(addsuffix .d, $(basename $(lib_src)))
 
-tester_src = example.cc
+tester_src = test/test.cc test/test_sort.cc
 tester_obj = $(addsuffix .o, $(basename $(tester_src)))
 dep       += $(addsuffix .d, $(basename $(tester_src)))
 
-tester = example
+tester = test/tester
 
 #-------------------------------------------------------------------------------
 # Get Mercurial id, and make version.o depend on it via .id file.
@@ -93,9 +93,12 @@ version.o: .id
 # TestSweeper specific flags and libraries
 
 # additional flags and libraries for testers
+TEST_CXXFLAGS += -I.
 TEST_LDFLAGS += -L. -Wl,-rpath,$(abspath .)
 TEST_LIBS    += -ltestsweeper
 
+$(tester_obj): CXXFLAGS += $(TEST_CXXFLAGS)
+
 #-------------------------------------------------------------------------------
 # Rules
 .DELETE_ON_ERROR:
@@ -175,10 +178,10 @@ docs-todo:
 #-------------------------------------------------------------------------------
 # general rules
 clean:
-	$(RM) *.o *.a *.so *.gch $(tester)
+	$(RM) $(lib_a) $(lib_so) $(lib_obj) $(tester_obj) $(dep) $(headers_gch) $(tester)
 
 distclean: clean
-	$(RM) make.inc $(dep)
+	$(RM) make.inc
 
 %.o: %.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@

INSTALL.md

@@ -47,7 +47,7 @@ Available targets:
                      then compiles the library and tester
     make config    - configures TestSweeper, creating a make.inc file
     make lib       - compiles the library (lib/libtestsweeper.so)
-    make tester    - compiles the tester (example)
+    make tester    - compiles test/tester
     make docs      - todo: generates documentation in docs/html/index.html
     make install   - installs the library and headers to ${prefix}
     make uninstall - remove installed library and headers from ${prefix}

Jenkinsfile

@@ -50,7 +50,7 @@ stages {
                         make -j8
 
                         echo "========================================"
-                        ldd example
+                        ldd test/tester
 
                         echo "========================================"
                         cd test

test/CMakeLists.txt

@@ -0,0 +1,33 @@
+#-------------------------------------------------------------------------------
+set( tester "${testsweeper_}tester" )
+add_executable(
+    ${tester}
+    test.cc
+    test_sort.cc
+)
+
+# C++11 is inherited from testsweeper, but disabling extensions is not.
+set_target_properties( ${tester} PROPERTIES CXX_EXTENSIONS false )
+
+target_link_libraries(
+    ${tester}
+    testsweeper
+)
+
+# Copy run_tests script and reference output to build directory.
+add_custom_command(
+    TARGET ${tester} POST_BUILD
+    COMMAND
+        cp -a ${CMAKE_CURRENT_SOURCE_DIR}/run_tests.py
+              ${CMAKE_CURRENT_SOURCE_DIR}/ref
+              ${CMAKE_CURRENT_BINARY_DIR}/
+)
+
+if (testsweeper_is_project)
+    add_custom_target(
+        "check"
+        COMMAND
+            python run_tests.py
+        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+    )
+endif()