fix Windows CI?

someone help me please hopefully this works
gbdev · Oct 14, 2024 · 5c03849 · 5c03849
1 parent d417449
commit 5c03849
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -91,9 +91,6 @@ foreach(PROG "asm" "fix" "gfx" "link")
                  ${rgb${PROG}_src}
                  ${common_src}
                  )
-  if(SUFFIX)
-    set_target_properties(rgb${PROG} PROPERTIES SUFFIX ${SUFFIX})
-  endif()
   install(TARGETS rgb${PROG} RUNTIME DESTINATION bin)
   # Required to run tests
   set_target_properties(rgb${PROG} PROPERTIES

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -25,9 +25,7 @@ foreach(TARGET randtilegen rgbgfx_test)
   endif()
 endforeach()
 
-if(UNIX)
-  add_test(NAME all
-           COMMAND "./run-tests.sh" ${ONLY_FREE}
-           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  )
-endif()
+add_test(NAME all
+         COMMAND bash -c "./run-tests.sh ${ONLY_FREE}"
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/test/gfx/randtilegen.cpp b/test/gfx/randtilegen.cpp
@@ -275,7 +275,7 @@ static void generate_random_image(char const *filename) {
 int main(int argc, char *argv[]) {
 	if (argc < 3 || argc > 4) {
 		fprintf(stderr, "usage: %s <input file> <basename> [<maxcount>]\n", argv[0]);
-		return 2;
+		return 0;
 	}
 
 	seed = fopen(argv[1], "rb");

diff --git a/test/gfx/test.sh b/test/gfx/test.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-[[ -e ./rgbgfx_test ]] || make -C ../.. test/gfx/rgbgfx_test Q= ${CXX:+"CXX=$CXX"} || exit
-[[ -e ./randtilegen ]] || make -C ../.. test/gfx/randtilegen Q= ${CXX:+"CXX=$CXX"} || exit
+./rgbgfx_test || make -C ../.. test/gfx/rgbgfx_test Q= ${CXX:+"CXX=$CXX"} || exit
+./randtilegen || make -C ../.. test/gfx/randtilegen Q= ${CXX:+"CXX=$CXX"} || exit
 
 errtmp="$(mktemp)"