.github/workflows/cd.yml

@@ -38,46 +38,9 @@ jobs:
       run: ${{github.workspace}}/build/bin/mono_time_test.exe
 
     - uses: actions/upload-artifact@v3
-      if: success() || failure()
       with:
         name: ${{ github.event.repository.name }}-windows-msvc-x86_64
         # TODO: do propper packing
         path: |
           ${{github.workspace}}/build/bin/
 
-  windows-asan:
-    timeout-minutes: 15
-
-    runs-on: windows-2019
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Install Dependencies
-      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static
-
-    # setup vs env
-    - uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: amd64
-
-    - name: Configure CMake
-      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_ASAN=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
-
-    - name: temp test
-      run: ${{github.workspace}}/build/bin/mono_time_test.exe
-
-    - uses: actions/upload-artifact@v3
-      if: success() || failure()
-      with:
-        name: ${{ github.event.repository.name }}-windows-msvc-asan-x86_64
-        # TODO: do propper packing
-        # TODO: also switch to asan dlls
-        path: |
-          ${{github.workspace}}/build/bin/
-

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14...3.24 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 
 # cmake setup begin
 project(tomato)
@@ -18,26 +18,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-option(TOMATO_ASAN "Build tomato with asan (gcc/clang/msvc)" OFF)
-
-if (TOMATO_ASAN)
-	if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-		if (NOT WIN32) # exclude mingw
-			link_libraries(-fsanitize=address)
-			#link_libraries(-fsanitize=address,undefined)
-			#link_libraries(-fsanitize=undefined)
-			message("II enabled ASAN")
-		else()
-			message("!! can not enable ASAN on this platform (gcc/clang + win)")
-		endif()
-	elseif (MSVC)
-		add_compile_options("/fsanitize=address")
-		message("II enabled ASAN")
-	else()
-		message("!! can not enable ASAN on this platform")
-	endif()
-endif()
-
 # external libs
 add_subdirectory(./external) # before increasing warn levels, sad :(
 
@@ -53,8 +33,13 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL
 		#-Wsign-conversion # Warn on sign conversions
 		-Wshadow # Warn if a variable declaration shadows one from a parent context
 	)
+
+	if (NOT WIN32)
+		#link_libraries(-fsanitize=address,undefined)
+		#link_libraries(-fsanitize=undefined)
+	endif()
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-	if (MSVC)
+	if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
 		string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 	else()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")

external/toxcore/mono_time_test.cc

@@ -113,25 +113,25 @@ int main(int argc, char **argv) {
 		std::cerr << "MonoTimeUnixTimeIncreasesOverTime() failed\n";
 		return -1;
 	}
-	std::cerr << "MonoTimeUnixTimeIncreasesOverTime() succeeded\n";
+	std::cout << "MonoTimeUnixTimeIncreasesOverTime() succeeded\n";
 
 	if (!run_test_MonoTimeIsTimeout()) {
 		std::cerr << "MonoTimeIsTimeout() failed\n";
 		return -1;
 	}
-	std::cerr << "MonoTimeIsTimeout() succeeded\n";
+	std::cout << "MonoTimeIsTimeout() succeeded\n";
 
 	if (!run_test_MonoTimeIsTimeoutReal()) {
 		std::cerr << "MonoTimeIsTimeoutReal() failed\n";
 		return -1;
 	}
-	std::cerr << "MonoTimeIsTimeoutReal() succeeded\n";
+	std::cout << "MonoTimeIsTimeoutReal() succeeded\n";
 
 	if (!run_test_MonoTimeCustomTime()) {
 		std::cerr << "MonoTimeCustomTime() failed\n";
 		return -1;
 	}
-	std::cerr << "MonoTimeCustomTime() succeeded\n";
+	std::cout << "MonoTimeCustomTime() succeeded\n";
 
 	return 0;
 }