[TEST] Removed zarathustra, included text files into repo

xxsds · Oct 6, 2018 · 6c4742c · 6c4742c
1 parent 645adda
commit 6c4742c
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 46 deletions.
diff --git a/test/README.md b/test/README.md
@@ -61,8 +61,7 @@ target will be `your-structure-test`.
 
 ## Acknowledgements
   We thank
-  * Project Gutenberg for providing text files `faust.txt` and
-    `zarathustra.txt`.
+  * Project Gutenberg for providing text files `faust.txt`.
   * Shane Culpepper for providing the test inputs
     `keeper.int` and `moby.int` for the integer-alphabet CSAs and CSTs.
 

diff --git a/test/csa_byte_test.config b/test/csa_byte_test.config
@@ -2,4 +2,3 @@ empty.txt
 example01.txt
 100a.txt
 faust.txt
-zarathustra.txt
diff --git a/test/csa_int_test.config b/test/csa_int_test.config
@@ -1,8 +1,7 @@
-# Each line contains [TEST_CASE_NAME];[NUM_BYTE] 
+# Each line contains [TEST_CASE_NAME];[NUM_BYTE]
 empty.txt;1
 example01.txt;1
 100a.txt;1
 faust.txt;1
-zarathustra.txt;1
 keeper.int;8
 moby.int;8
diff --git a/test/cst_byte_test.config b/test/cst_byte_test.config
@@ -2,4 +2,3 @@ empty.txt
 example01.txt
 100a.txt
 faust.txt
-#zarathustra.txt
diff --git a/test/cst_int_test.config b/test/cst_int_test.config
@@ -1,10 +1,9 @@
 # Texts which should be used in the CstIntTest.
-# Each line contains [TEST_CASE_FILE];[NUM_BYTE] 
+# Each line contains [TEST_CASE_FILE];[NUM_BYTE]
 empty.txt;1
 example01.txt;1
 100a.txt;1
 faust.txt;1
-#zarathustra.txt;1
 keeper.int;8
 moby.int;8
 int-vec-sa.100000.18.r;0
diff --git a/test/download.cmake b/test/download.cmake
diff --git a/test/download.config b/test/download.config
diff --git a/test/download_files.cmake b/test/download_files.cmake
@@ -1,23 +1,17 @@
-## download 
-## Download files specified in a ${CMAKE_CURRENT_LIST_DIR}/download.config
-#  Each file should be specified on a seperate line as tuple (file;URL)
+# TODO: move to CMakeLists.txt? or is it needed by examples/tutorials?
+# TODO: should the files be made a target?
 
-file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/download.config download_config_lines REGEX "^[^#].*")
-foreach(download_config_line ${download_config_lines})
-    list(GET download_config_line 0 download_file)
-    list(GET download_config_line 1 download_url)
-    string(REPLACE ".tar.gz" "" download_file_we ${download_file})
-    set(abs_test_case_name ${CMAKE_CURRENT_LIST_DIR}/test_cases/${download_file_we})
-
-    add_custom_command(OUTPUT ${abs_test_case_name}
-                      COMMAND ${CMAKE_COMMAND} -Ddownload_url=${download_url} -Dtest_case_dir=${CMAKE_CURRENT_LIST_DIR}/test_cases -P ${CMAKE_CURRENT_LIST_DIR}/download.cmake
-                      WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-                      COMMENT "Checking or downloading test case ${download_file}."
-                      VERBATIM
-    )
-    add_custom_target(${download_file_we}
-                      DEPENDS ${abs_test_case_name})
-    list(APPEND generated_files ${abs_test_case_name})
-endforeach(download_config_line)
+# TODO: path correct?
+file(GLOB ZIPPED_TEST_CASES ${CMAKE_CURRENT_LIST_DIR}/test_cases/*.tar.gz)
 
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test_cases")
 
+foreach(zipped_test_case ${ZIPPED_TEST_CASES})
+    get_filename_component(file_name ${zipped_test_case} NAME)
+    string(REPLACE ".tar.gz" "" file_name ${file_name})
+    if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/test_cases/${file_name}")
+        message("Unzipped ${file_name}")
+        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${zipped_test_case}
+                        WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/test_cases/")
+    endif()
+endforeach(zipped_test_case)
diff --git a/test/lcp_construct_test.config b/test/lcp_construct_test.config
@@ -2,4 +2,3 @@ empty.txt
 example01.txt
 100a.txt
 faust.txt
-zarathustra.txt
diff --git a/test/sa_construct_test.config b/test/sa_construct_test.config
@@ -3,4 +3,3 @@ one_byte.txt
 example01.txt
 100a.txt
 faust.txt
-zarathustra.txt
diff --git a/test/search_bidirectional_test.config b/test/search_bidirectional_test.config
@@ -4,4 +4,3 @@ empty.txt
 example01.txt
 100a.txt
 faust.txt
-zarathustra.txt
diff --git a/test/test_cases/faust.txt.tar.gz b/test/test_cases/faust.txt.tar.gz
diff --git a/test/test_cases/moby.int.tar.gz b/test/test_cases/moby.int.tar.gz
diff --git a/test/wt_byte_test.config b/test/wt_byte_test.config
@@ -4,4 +4,3 @@ example01.txt
 100a.txt
 all_symbols.txt
 faust.txt
-#zarathustra.txt