Changeset 2414

Timestamp:

03/12/10 21:32:22 (5 months ago)

Author:

aturner

Message:

add additional unit test and indvidual make test_* targets
refs #341

Location:

trunk/test

Files:

• CMakeLists.txt (modified) (2 diffs)
• RunUnitTest.cmake.in (modified) (5 diffs)

trunk/test/CMakeLists.txt

@@ -45 +45 @@
 
 set(tcpreplay_tests replay_basic replay_cache replay_pps replay_rate replay_top
-    replay_config replay_multi replay_pps_multi)
+    replay_config replay_multi replay_pps_multi replay_precache)
 
 #########################################################
@@ -76 +76 @@
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test
     DEPENDS Tests.cmake
+    COMMENT "Run all unit tests"
     VERBATIM)
+foreach(__test @tcpprep_tests@ @tcpreplay_tests@ @tcprewrite_tests@)
+    add_custom_target(${__test})
+    add_custom_command(TARGET ${__test}
+        COMMAND cmake -D RUN_SINGLE:STRING=${__test} -P Tests.cmake
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test
+        DEPENDS Tests.cmake 
+        COMMENT "Run single unit test: ${__test}"
+        VERBATIM)
+endforeach(__test)
 
 # Add output files of tests to ADDITIONAL_MAKE_CLEAN_FILES

trunk/test/RunUnitTest.cmake.in

@@ -47 +47 @@
 set(replay_multi "-i @NIC1@ --multiplier=25.0 test.pcap")
 set(replay_pps_multi "-i @NIC1@ --pps=100 --pps-multi=5 test.pcap")
+set(replay_precache "-i @NIC1@ --preload-pcap test.pcap")
 
 set(DIFF @DIFF@)
@@ -69 +70 @@
         string(REPLACE __file__ ${output_file} new_command "${${__test}}")
     endif(standard)
-        
 
     set(stderr "")
     set(stdout "")
     set(rcode 0)
-    
-    
+
     if(__test MATCHES "rewrite_")
         # tcprewrite test!
@@ -118 +117 @@
             OUTPUT_STRIP_TRAILING_WHITESPACE)
     endif(__test MATCHES "rewrite_")
-    
+
     if(NOT standard)
         if(rcode EQUAL 0)
@@ -125 +124 @@
                     execute_process(COMMAND @DIFF@ ${standard_file} ${output_file}
                     RESULT_VARIABLE diff_rcode)
-            
+
                     if(${diff_rcode} EQUAL 0)
                         message(STATUS "Running ${__test}: OK!")
@@ -135 +134 @@
                 endif(DIFF)
             else(EXISTS ${output_file})
-                message(STATUS "Running ${__test}: OK!")            
+                message(STATUS "Running ${__test}: OK!")
             endif(EXISTS ${output_file})
-            
+
         else(rcode EQUAL 0)
             message(STATUS "Running ${__test}: FAILED!  Error code: ${rcode}")