From b76b401cf1131cb19764dd6cc88c104b85fb8f1a Mon Sep 17 00:00:00 2001 From: J08nY Date: Tue, 7 May 2024 10:47:02 +0200 Subject: Add signal handling to Crypto++. --- .../src/test/java/cz/crcs/ectester/standalone/AppTests.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'standalone/src/test/java') diff --git a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java index 7ff2826..8802bb4 100644 --- a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java +++ b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java @@ -162,7 +162,6 @@ public class AppTests { @ParameterizedTest @MethodSource("libs") - @Timeout(20) public void miscSuite(String libName) { String[] args = buildCLIArgs(libName, "miscellaneous", "-q"); if (libName.equals("Botan") || libName.equals("Crypto++")) { @@ -173,7 +172,6 @@ public class AppTests { @ParameterizedTest @MethodSource("libs") - @Timeout(20) public void twistSuite(String libName) { // TODO: "Nettle" is very broken here for a weird reason. assumeFalse(libName.equals("Nettle")); @@ -187,7 +185,6 @@ public class AppTests { @ParameterizedTest @MethodSource("libs") - @Timeout(20) public void degenerateSuite(String libName) { // TODO: "Nettle" is very broken here for a weird reason. assumeFalse(libName.equals("Nettle")); @@ -201,7 +198,6 @@ public class AppTests { @ParameterizedTest @MethodSource("libs") - @Timeout(20) public void edgeCasesSuite(String libName) { // TODO: Crypto++ and tomcrypt is broken here. assumeFalse(libName.equals("Crypto++") || libName.equals("tomcrypt")); @@ -215,7 +211,6 @@ public class AppTests { @ParameterizedTest @MethodSource("libs") - @Timeout(20) // TODO: This breaks the tests because the libs do all sorts of weird stuff here. @Disabled public void compositeSuite(String libName) { @@ -231,7 +226,6 @@ public class AppTests { @ParameterizedTest @MethodSource("libs") - @Timeout(20) public void cofactorSuite(String libName) { String[] args = buildCLIArgs(libName, "cofactor", "-q"); if (libName.equals("Botan") || libName.equals("Crypto++")) { @@ -242,7 +236,6 @@ public class AppTests { @ParameterizedTest @MethodSource("libs") - @Timeout(20) // TODO: This breaks the tests because the libs do all sorts of weird stuff here. @Disabled public void wrongSuite(String libName) { @@ -258,7 +251,6 @@ public class AppTests { @ParameterizedTest @MethodSource("libs") - @Timeout(20) public void invalidSuite(String libName) { // TODO: "Nettle" is very broken here for a weird reason. assumeFalse(libName.equals("Nettle")); -- cgit v1.3.1 From a765087f0fb9d21eb26780a187dbca23e9267376 Mon Sep 17 00:00:00 2001 From: J08nY Date: Tue, 7 May 2024 15:43:18 +0200 Subject: Fix signal restoration in signal handling. --- .../main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c | 6 +++--- standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'standalone/src/test/java') diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c index a1ea9f1..dd08bb8 100644 --- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c +++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c @@ -83,9 +83,9 @@ void deinit_signals() { //printf("Deinitializing signals!\n"); pthread_cancel(timer_thread); - sigaction(SIGSEGV, NULL, &old_segv); - sigaction(SIGABRT, NULL, &old_abrt); - sigaction(SIGALRM, NULL, &old_alrm); + sigaction(SIGSEGV, &old_segv, NULL); + sigaction(SIGABRT, &old_abrt, NULL); + sigaction(SIGALRM, &old_alrm, NULL); target = NULL; initialized = false; diff --git a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java index 8802bb4..c94824c 100644 --- a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java +++ b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java @@ -2,7 +2,6 @@ package cz.crcs.ectester.standalone; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.junitpioneer.jupiter.StdIo; -- cgit v1.3.1 From 2e6207f7d83d9efb8db571ca4f04d79ca63f212f Mon Sep 17 00:00:00 2001 From: J08nY Date: Tue, 7 May 2024 16:24:22 +0200 Subject: Disable bad tests via comment instead of @Disable. --- standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'standalone/src/test/java') diff --git a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java index c94824c..c39ee54 100644 --- a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java +++ b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java @@ -208,6 +208,7 @@ public class AppTests { ECTesterStandalone.main(args); } + /* @ParameterizedTest @MethodSource("libs") // TODO: This breaks the tests because the libs do all sorts of weird stuff here. @@ -222,6 +223,7 @@ public class AppTests { } ECTesterStandalone.main(args); } + */ @ParameterizedTest @MethodSource("libs") @@ -233,6 +235,7 @@ public class AppTests { ECTesterStandalone.main(args); } + /* @ParameterizedTest @MethodSource("libs") // TODO: This breaks the tests because the libs do all sorts of weird stuff here. @@ -247,6 +250,7 @@ public class AppTests { } ECTesterStandalone.main(args); } + */ @ParameterizedTest @MethodSource("libs") -- cgit v1.3.1