* refactor PR based on reviews

Windows-on-ARM-Experiments · Nov 20, 2023 · 7a01b52 · 7a01b52
1 parent c96e667
commit 7a01b52
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 25 deletions.
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/tests/BUILD.txt b/tests/BUILD.txt
@@ -3,5 +3,5 @@ Building aarch64-w64-mingw32 tests on Linux or WSL
 cmake -S . -B build
 cmake --build build
 
-it generates Arm64 Windows executable
-build/aarch64_mingw_tests
+It generates Arm64 Windows executable.
+build/bin/aarch64_mingw_tests.exe
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,10 +1,18 @@
 set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_C_COMPILER "$ENV{HOME}/cross/bin/aarch64-w64-mingw32-gcc")
+
+if (NOT DEFINED ENV{TARGET}) 
+  set(ENV{TARGET} "aarch64-w64-mingw32") 
+endif()
+if (NOT DEFINED ENV{INSTALL_PATH}) 
+  set(ENV{INSTALL_PATH} "$ENV{HOME}/cross") 
+endif()
+
+set(CMAKE_C_COMPILER "$ENV{INSTALL_PATH}/bin/$ENV{TARGET}-gcc")
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_COMPILER "$ENV{HOME}/cross/bin/aarch64-w64-mingw32-c++")
-set(CMAKE_RANLIB "$ENV{HOME}/cross/bin/aarch64-w64-mingw32-ranlib")
+set(CMAKE_CXX_COMPILER "$ENV{INSTALL_PATH}/bin/$ENV{TARGET}-c++")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fopenmp")
+set(CMAKE_RANLIB "$ENV{INSTALL_PATH}/bin/$ENV{TARGET}-ranlib")
 
 include(FetchContent)
 FetchContent_Declare(
@@ -20,28 +28,28 @@ project(aarch64_mingw_tests)
 enable_testing()
 
 add_executable(
-  aarch64_mingw_tests
-  bigdata_test.cpp
-  iostream_test.cpp
-  math_test.c
-  math_test.cpp
-  omp_test.c
-  omp_test.cpp
-  pdata_test.c
-  pdata_test.cpp
-  sjlj_test.c
-  sjlj_test.cpp
-  struct_test.c
-  struct_test.cpp
-  throw_test.cpp
-  varargs_test.c
-  varargs_test.cpp
+  aarch64-mingw-tests.exe
+  bigdata-test.cpp
+  iostream-test.cpp
+  math-test.c
+  math-test.cpp
+  omp-test.c
+  omp-test.cpp
+  pdata-test.c
+  pdata-test.cpp
+  sjlj-test.c
+  sjlj-test.cpp
+  struct-test.c
+  struct-test.cpp
+  throw-test.cpp
+  varargs-test.c
+  varargs-test.cpp
 )
 
-set_source_files_properties(test-dll.c PROPERTIES COMPILE_FLAGS "-DIMPORT_API=")
-
 target_link_libraries(
-  aarch64_mingw_tests
+  aarch64-mingw-tests.exe
   GTest::gtest_main
   dbghelp
 )
+
+set_target_properties(aarch64-mingw-tests.exe PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
diff --git a/tests/bigdata_test.cpp → tests/bigdata-test.cpp b/tests/bigdata_test.cpp → tests/bigdata-test.cpp
diff --git a/tests/dll_test.c → tests/dll-test.c b/tests/dll_test.c → tests/dll-test.c
diff --git a/tests/dll_test.cpp → tests/dll-test.cpp b/tests/dll_test.cpp → tests/dll-test.cpp
diff --git a/tests/iostream_test.cpp → tests/iostream-test.cpp b/tests/iostream_test.cpp → tests/iostream-test.cpp
diff --git a/tests/math_test.c → tests/math-test.c b/tests/math_test.c → tests/math-test.c
diff --git a/tests/math_test.cpp → tests/math-test.cpp b/tests/math_test.cpp → tests/math-test.cpp
diff --git a/tests/omp_test.c → tests/omp-test.c b/tests/omp_test.c → tests/omp-test.c
diff --git a/tests/omp_test.cpp → tests/omp-test.cpp b/tests/omp_test.cpp → tests/omp-test.cpp
diff --git a/tests/openblas_test.c → tests/openblas-test.c b/tests/openblas_test.c → tests/openblas-test.c
diff --git a/tests/openblas_test.cpp → tests/openblas-test.cpp b/tests/openblas_test.cpp → tests/openblas-test.cpp
diff --git a/tests/pdata_test.c → tests/pdata-test.c b/tests/pdata_test.c → tests/pdata-test.c
@@ -40,7 +40,7 @@ static void print_symbol(HANDLE hp, DWORD64 offset)
 
 	if (SymGetSymFromAddr64(hp, offset, &dwDisplacement, p))
 	{
-		printf(" %s+0x%.04llX", p->Name, dwDisplacement);
+		// printf(" %s+0x%.04llX", p->Name, dwDisplacement);
 	}
 	else
 	{

diff --git a/tests/pdata_test.cpp → tests/pdata-test.cpp b/tests/pdata_test.cpp → tests/pdata-test.cpp
diff --git a/tests/sjlj_test.c → tests/sjlj-test.c b/tests/sjlj_test.c → tests/sjlj-test.c
diff --git a/tests/sjlj_test.cpp → tests/sjlj-test.cpp b/tests/sjlj_test.cpp → tests/sjlj-test.cpp
diff --git a/tests/struct_test.c → tests/struct-test.c b/tests/struct_test.c → tests/struct-test.c
diff --git a/tests/struct_test.cpp → tests/struct-test.cpp b/tests/struct_test.cpp → tests/struct-test.cpp
diff --git a/tests/throw_test.cpp → tests/throw-test.cpp b/tests/throw_test.cpp → tests/throw-test.cpp
diff --git a/tests/varargs_test.c → tests/varargs-test.c b/tests/varargs_test.c → tests/varargs-test.c
diff --git a/tests/varargs_test.cpp → tests/varargs-test.cpp b/tests/varargs_test.cpp → tests/varargs-test.cpp