darlinghq/ctest
1
0
Fork 0
mirror of https://github.com/darlinghq/ctest.git synced 2024-12-04 18:46:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Portability Pull Request:

Browse Source 
This commit removes dependency of two POSIX functions which are not supported on many non-unix/linux platforms (one exception is CYGWIN).
gettimeofday() is replaced with the standard clock() function. On windows, the kill() call is skipped, as segmentation fault will terminate the process in any case (without core-dump).
These changes enables ctest to compile and work with both MinGW gcc, clang and TINYC on Windows with SEGFAULT enabled. (TINYC on Linux misbehaves, but this is likely an issue with TINYC).
This commit is contained in:
Tyge Løvset 2022-12-31 11:30:20 +01:00 committed by Bas van den Berg
parent 0700b738c2
commit ba5bf18a38
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ctest.h
View File

@ -243,8 +243,13 @@ void assert_dbl_compare(const char* cmp, double exp, double real, double tol, co
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
#if !defined(_WIN32) || defined(__GNUC__)
#include <unistd.h>
#elif defined(_WIN32)
#include <io.h>
#include <process.h>
#endif
#include <stdint.h>
#include <stdlib.h>
#include <wchar.h>
@ -472,15 +477,6 @@ static int suite_filter(struct ctest* t) {
return strncmp(suite_name, t->ssname, strlen(suite_name)) == 0;
}
static uint64_t getCurrentTime(void) {
struct timeval now;
gettimeofday(&now, NULL);
uint64_t now64 = (uint64_t) now.tv_sec;
now64 *= 1000000;
now64 += ((uint64_t) now.tv_usec);
return now64;
}
static void color_print(const char* color, const char* text) {
if (color_output)
printf("%s%s" ANSI_NORMAL "\n", color, text);
@ -501,7 +497,9 @@ static void sighandler(int signum)
/* "Unregister" the signal handler and send the signal back to the process
* so it can terminate as expected */
signal(signum, SIG_DFL);
#if !defined(_WIN32) || defined(__CYGWIN__)
kill(getpid(), signum);
#endif
}
#endif
@ -529,7 +527,7 @@ __attribute__((no_sanitize_address)) int ctest_main(int argc, const char *argv[]
#else
color_output = isatty(1);
#endif
uint64_t t1 = getCurrentTime();
uint64_t t1 = clock();
struct ctest* ctest_begin = &CTEST_IMPL_TNAME(suite, test);
struct ctest* ctest_end = &CTEST_IMPL_TNAME(suite, test);
@ -588,11 +586,11 @@ __attribute__((no_sanitize_address)) int ctest_main(int argc, const char *argv[]
idx++;
}
}
uint64_t t2 = getCurrentTime();
uint64_t t2 = clock();
const char* color = (num_fail) ? ANSI_BRED : ANSI_GREEN;
char results[80];
snprintf(results, sizeof(results), "RESULTS: %d tests (%d ok, %d failed, %d skipped) ran in %" PRIu64 " ms", total, num_ok, num_fail, num_skip, (t2 - t1)/1000);
snprintf(results, sizeof(results), "RESULTS: %d tests (%d ok, %d failed, %d skipped) ran in %" PRIu64 " ms", total, num_ok, num_fail, num_skip, (t2 - t1)*1000/CLOCKS_PER_SEC);
color_print(color, results);
return num_fail;
}