Moved testing gif file to test/data submodule

ndsev · Sep 1, 2023 · adf6076 · adf6076
1 parent 20377fa
commit adf6076
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -57,6 +57,7 @@ compare_test_data()
     local MSYS_WORKAROUND_TEMP=("${!1}"); shift
     local TEST_SUITES=("${MSYS_WORKAROUND_TEMP[@]}")
 
+    echo
     echo "Comparing data created by tests"
 
     local TOTAL_BLOBS=0
@@ -110,7 +111,11 @@ compare_test_data()
         TOTAL_JSONS=$((TOTAL_JSONS+NUM_JSONS))
     done
 
-    echo "Successfully compared ${TOTAL_BLOBS} BLOBs and ${TOTAL_JSONS} JSONs."
+    if [[ $((TOTAL_BLOBS+TOTAL_JSONS)) -gt 0 ]] ; then
+        echo "Successfully compared ${TOTAL_BLOBS} BLOBs and ${TOTAL_JSONS} JSONs."
+    else
+        echo "Nothing to compare."
+    fi
     echo
 }
 

diff --git a/test/data b/test/data
diff --git a/test/others/gif/CMakeLists.txt b/test/others/gif/CMakeLists.txt
@@ -64,9 +64,9 @@ zserio_add_library(gif_zs
 )
 
 add_custom_command(OUTPUT gif_data_copy
-                   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/data/others/gif
                            ${CMAKE_CURRENT_BINARY_DIR}/data
-                   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data
+                   DEPENDS ${CMAKE_SOURCE_DIR}/data/others/gif
                    COMMENT "Copying data directory for gif test")
 add_custom_target(gif_data_copy_target DEPENDS gif_data_copy)
 add_dependencies(gif_zs gif_data_copy_target)

diff --git a/test/others/gif/build.xml b/test/others/gif/build.xml
@@ -30,7 +30,7 @@
         <testRun testName="gif">
             <resources>
                 <copy todir="${gif.run_dir}/data">
-                    <fileset dir="${gif.base_dir}/data"/>
+                    <fileset dir="${zserio_java_test.base_dir}/data/others/gif"/>
                 </copy>
             </resources>
         </testRun>

diff --git a/test/others/gif/data/1pix.gif b/test/others/gif/data/1pix.gif
diff --git a/test/others/gif/python/GifTest.py b/test/others/gif/python/GifTest.py
@@ -28,7 +28,8 @@ def testOnePixGif(self):
         self.assertEqual(self.GIF_SCREEN_BITS_OF_COLOR_RESOLUTION, screenDescriptor.bits_of_color_resolution)
         self.assertEqual(self.GIF_SCREEN_BITS_PER_PIXEL, screenDescriptor.bits_per_pixel)
 
-    ONE_PIX_GIF_FILE_NAME = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "data", "1pix.gif")
+    ONE_PIX_GIF_FILE_NAME = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                                         "..", "..", "..", "data", "others", "gif", "1pix.gif")
 
     GIF_FILE_FORMAT = "GIF"
     GIF_FILE_VERSION = "89a"