Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed various compiler warnings by clang and gcc #50

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

Fixed various compiler warnings by clang and gcc #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3f286e5
Fixed -Wstrict-prototypes
carsonak Dec 10, 2024
6ebc7d5
Fixed -Wwritable-strings and -Wunused-variable in internal tests
carsonak Dec 10, 2024
db3487e
Fixed -Wunused-but-set-variable
carsonak Dec 10, 2024
d6c6803
Removed the TAU_DISABLE_DEBUG_WARNINGS macro in tau.h
carsonak Dec 10, 2024
0ae5299
Fixed -Wsign-compare
carsonak Dec 10, 2024
6f23e9e
Reduce clang and gcc suppresions to -Wunused-function
carsonak Dec 10, 2024
ad744b9
Fixed -Wignored-qualifiers
carsonak Dec 10, 2024
135a5e6
Upgraded external tests standards to c++14 for binary literals
carsonak Dec 10, 2024
60faed1
Fixed various warnings in ThirdParty Tests
carsonak Dec 10, 2024
65d3b19
Fixed logic for tauShouldDecomposeMacro and added more tests
carsonak Dec 10, 2024
fdff38e
Fixed -Wunused-lambda-capture
carsonak Dec 10, 2024
39bfc7e
Fixed logic bug in tauShouldDecomposeMacro
carsonak Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 55 additions & 110 deletions tau/compilers.h
View file
Open in desktop

Large diffs are not rendered by default.

66 changes: 24 additions & 42 deletions tau/tau.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ TAU_DISABLE_DEBUG_WARNINGS

#ifndef TAU_NO_TESTING

typedef void (*tau_testsuite_t)();
typedef void (*tau_testsuite_t)(void);
typedef struct tauTestSuiteStruct {
tau_testsuite_t func;
char* name;
Expand Down Expand Up @@ -157,17 +157,17 @@ extern volatile int shouldAbortTest;
appropriately - fail the current test suite and carry on with the other checks (or move on to the next
suite in the case of a REQUIRE)
*/
static void failIfInsideTestSuite__();
static void abortIfInsideTestSuite__();
static void failIfInsideTestSuite__(void);
static void abortIfInsideTestSuite__(void);

static void failIfInsideTestSuite__() {
static void failIfInsideTestSuite__(void) {
if(checkIsInsideTestSuite == 1) {
hasCurrentTestFailed = 1;
shouldFailTest = 1;
}
}

static void abortIfInsideTestSuite__() {
static void abortIfInsideTestSuite__(void) {
if(checkIsInsideTestSuite == 1) {
hasCurrentTestFailed = 1;
shouldAbortTest = 1;
Expand All @@ -176,7 +176,7 @@ static void abortIfInsideTestSuite__() {

#endif // TAU_NO_TESTING

static void incrementWarnings() {
static void incrementWarnings(void) {
#ifndef TAU_NO_TESTING
tauStatsNumWarnings++;
#endif // TAU_NO_TESTING
Expand Down Expand Up @@ -244,7 +244,7 @@ TAU_EXTERN volatile int isCurrentTestIgnored;
NOTE: This method has been edited to return the time (in nanoseconds). Depending on how large this value
(e.g: 54890938849ns), we appropriately convert it to milliseconds/seconds before displaying it to stdout.
*/
static inline double tauClock() {
static inline double tauClock(void) {
#ifdef TAU_WIN_
LARGE_INTEGER counter;
LARGE_INTEGER frequency;
Expand Down Expand Up @@ -429,8 +429,10 @@ tauColouredPrintf(const int colour, const char* const fmt, ...) {
printf(__VA_ARGS__)
#endif // TAU_NO_TESTING


static inline int tauIsDigit(const char c) { return c >= '0' && c <= '9'; }
static inline int tauIsNumberConstant(const char c)
{
return ((c >= '0' && c <= '9') || c == '-' || c == '+' || c == '.');
}
// If the macro arguments can be decomposed further, we need to print the `In macro ..., so and so failed`.
// This method signals whether this message should be printed.
//
Expand All @@ -439,36 +441,16 @@ static inline int tauIsDigit(const char c) { return c >= '0' && c <= '9'; }
// See: https://stackoverflow.com/questions/20944784/why-is-conversion-from-string-constant-to-char-valid-in-c-but-invalid-in-c/20944858
static inline int tauShouldDecomposeMacro(const char* const actual, const char* const expected, const int isStringCmp) {
// Signal that the macro can be further decomposed if either of the following symbols are present
int dots = 0;
int numActualDigits = 0;
int numExpectedDigits = 0;

// If not inside a string comparison, we will return `1` only if we determine that `actual` is a variable
// name/expression (i.e for a value, we search through each character verifying that each is a digit
// - for floats, we allow a maximum of 1 '.' char)
// We can instead just check that the first character is either a digit, '+', '-' or '.' to filter out
// number constants since according to the standard identifiers cannot begin with digits.
// This accounts for number constants such as -44, 0xFA, 400000000UL, 0b0010(c++) and 1'000'123(c++).
if(!isStringCmp) {
for(int i = 0; i < strlen(actual); i++) {
if(tauIsDigit(actual[i])) {
numActualDigits++;
} else if(actual[i] == '.') {
dots++;
if(dots > 1) { return 1; }
} else {
return 1;
}
}
// Do the same for `expected`
dots = 0;
for(int i=0; i < strlen(expected); i++) {
if(tauIsDigit(expected[i])) {
numExpectedDigits++;
} else if(expected[i] == '.') {
dots++;
if(dots > 1) { return 1; }
} else {
return 1;
}
}
if (!tauIsNumberConstant(*actual) || !tauIsNumberConstant(*expected))
return 1;
}
// Inside a string comparison, we search for common expression tokens like the following:
// '(', ')', '-'
Expand Down Expand Up @@ -699,8 +681,8 @@ static void tauPrintColouredIfDifferent(const tau_u8 ch, const tau_u8 ref) {


static void tauPrintHexBufCmp(const void* const buff, const void* const ref, const int size) {
const tau_u8* const test_buff = TAU_CAST(const tau_u8* const, buff);
const tau_u8* const ref_buff = TAU_CAST(const tau_u8* const, ref);
const tau_u8 *const test_buff = TAU_CAST(const tau_u8 *, buff);
const tau_u8 *const ref_buff = TAU_CAST(const tau_u8 *, ref);

tauColouredPrintf(TAU_COLOUR_CYAN_,"<");
if(size != 0)
Expand Down Expand Up @@ -999,7 +981,7 @@ static void tauPrintHexBufCmp(const void* const buff, const void* const ref, con
static void __TAU_TEST_FIXTURE_TEARDOWN_##FIXTURE(struct FIXTURE* const); \
static void __TAU_TEST_FIXTURE_RUN_##FIXTURE##_##NAME(struct FIXTURE* const); \
\
static void __TAU_TEST_FIXTURE_##FIXTURE##_##NAME() { \
static void __TAU_TEST_FIXTURE_##FIXTURE##_##NAME(void) { \
struct FIXTURE fixture; \
memset(&fixture, 0, sizeof(fixture)); \
__TAU_TEST_FIXTURE_SETUP_##FIXTURE(&fixture); \
Expand Down Expand Up @@ -1062,7 +1044,7 @@ static void tauPrintHexBufCmp(const void* const buff, const void* const ref, con
static void __TAU_TEST_FIXTURE_TEARDOWN_##FIXTURE(struct FIXTURE* const); \
static void __TAU_TEST_FIXTURE_RUN_##FIXTURE##_##NAME(struct FIXTURE* const); \
\
static void __TAU_TEST_FIXTURE_##FIXTURE##_##NAME() { \
static void __TAU_TEST_FIXTURE_##FIXTURE##_##NAME(void) { \
struct FIXTURE fixture; \
memset(&fixture, 0, sizeof(fixture)); \
__TAU_TEST_FIXTURE_SETUP_##FIXTURE(&fixture); \
Expand Down Expand Up @@ -1165,7 +1147,7 @@ static inline FILE* tau_fopen(const char* const filename, const char* const mode
}


static void tau_help_() {
static void tau_help_(void) {
printf("Usage: %s [options] [test...]\n", tau_argv0_);
printf("\n");
printf("Run the specified unit tests; or if the option '--skip' is used, run all\n");
Expand Down Expand Up @@ -1264,7 +1246,7 @@ static tau_bool tauCmdLineRead(const int argc, const char* const * const argv) {
return tau_true;
}

static int tauCleanup() {
static int tauCleanup(void) {
for (tau_ull i = 0; i < tauTestContext.numTestSuites; i++)
free(TAU_PTRCAST(void* , tauTestContext.tests[i].name));

Expand All @@ -1278,7 +1260,7 @@ static int tauCleanup() {
}

// Triggers and runs all unit tests
static void tauRunTests() {
static void tauRunTests(void) {
// Run tests
for(tau_ull i = 0; i < tauTestContext.numTestSuites; i++) {
checkIsInsideTestSuite = 1;
Expand Down Expand Up @@ -1479,6 +1461,6 @@ inline int tau_main(const int argc, const char* const * const argv) {
// volatile int shouldAbortTest = 0;
#endif // TAU_NO_TESTING

TAU_DISABLE_DEBUG_WARNINGS_POP
TAU_DISABLE_DEBUG_WARNINGS_POP

#endif // TAU_H_
4 changes: 2 additions & 2 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
# ------ Setting the C/CXX Standard ------
set(CMAKE_C_EXTENSIONS OFF)
set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_C_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
Expand All @@ -18,4 +18,4 @@ endif() # TAU_BUILDINTERNALTESTS
if(TAU_BUILDTHIRDPARTYTESTS)
message("------- [INFO] Building ThirdParty Tests")
add_subdirectory(ThirdParty)
endif() # TAU_BUILDTHIRDPARTYTESTS
endif() # TAU_BUILDTHIRDPARTYTESTS
2 changes: 1 addition & 1 deletion test/InternalTests/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#include <tau/tau.h>
TAU_MAIN()
TAU_MAIN()
Loading