aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlns <matzeton@googlemail.com>2022-06-01 14:34:18 +0200
committerlns <matzeton@googlemail.com>2022-06-01 14:34:18 +0200
commitc18f3fd14d3a16b019ea50f81fc0b767a8b2a44c (patch)
tree609913577f8837d30fee0036d831bf8dead1ed36
parent4f213a3910f0aa7012ed6047c9eff6ea4487a6b6 (diff)
run additional release target tests
* fixed config/build errors/warnings Signed-off-by: lns <matzeton@googlemail.com>
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/CMakeMillerTests.cmake2
-rw-r--r--source/tools/loadmodule.c2
4 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fb7fdc..b01e290 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,6 +124,13 @@ tests-release:
- wine bin/tests.exe 1>&2 || { tail -n10 tests.log; false; }
- wine bin/loadmodule.exe bin/libw32miller-shared.dll
- wine bin/loadmodule.exe bin/libw32miller_pre-shared.dll
+ - wine bin/decrypter.exe bin/libw32miller-shared.dll
+ - wine bin/decrypter.exe bin/libw32miller_pre-shared.dll
+ - wine bin/decrypter.exe bin/loader_base.exe
+ - wine bin/decrypter.exe bin/loader_base_enc.exe
+ - wine bin/decrypter.exe bin/release.exe
+ - wine bin/loader_decrypt.exe
+ - wine bin/disasm.exe -fbin/release.exe
- kill -SIGKILL ${XVFB_PID}
stage: test-wine
only:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3822ca2..214f280 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.1)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(BUILD_FROM_TOPDIR true)
diff --git a/cmake/CMakeMillerTests.cmake b/cmake/CMakeMillerTests.cmake
index 8a40530..44e849b 100644
--- a/cmake/CMakeMillerTests.cmake
+++ b/cmake/CMakeMillerTests.cmake
@@ -1,4 +1,4 @@
-set(tests_cflags "-Wall -Wextra -Werror -Wno-cast-function-type -Wno-switch -std=gnu99 -ffast-math -fno-trapping-math -fno-signaling-nans -fvisibility=hidden -fomit-frame-pointer -fexpensive-optimizations -Os -static -fdata-sections -ffunction-sections")
+set(tests_cflags "-Wall -Wextra -Werror -Wno-cast-function-type -Wno-switch -Wno-address-of-packed-member -std=gnu99 -ffast-math -fno-trapping-math -fno-signaling-nans -fvisibility=hidden -fomit-frame-pointer -fexpensive-optimizations -Os -static -fdata-sections -ffunction-sections")
set(tests_ldflags "-s -Wl,--exclude-all-symbols -Wl,--exclude-libs,msvcrt.a -Wl,--gc-sections -Wl,--strip-all -Qn -v -fPIE")
set(TESTS_SRC run_tests.c test_compat.c test_mem.c test_pe.c test_utils.c test_asm.c test_aes.c test_crypt.c test_http.c)
diff --git a/source/tools/loadmodule.c b/source/tools/loadmodule.c
index 48bc8be..4d3fb22 100644
--- a/source/tools/loadmodule.c
+++ b/source/tools/loadmodule.c
@@ -17,7 +17,7 @@ int main(int argc, char** argv) {
} else if (argc == 1) {
path = dirname(argv[0]);
} else {
- printf("usage: %s [|PATH_TO_DLL]\n", path);
+ printf("usage: %s [|PATH_TO_DLL]\n", argv[0]);
return 1;
}