Merge pull request #5656 from larsewi/violation

CFE-4454: Fixed ODR violations in ASAN Unit Tests
cfengine · Dec 16, 2024 · 04e8624 · 04e8624
2 parents 0b53a32 + e8efa14
commit 04e8624
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 21 deletions.
diff --git a/.github/workflows/asan_unit_tests.yml b/.github/workflows/asan_unit_tests.yml
@@ -17,4 +17,4 @@ jobs:
     - name: Compile and link (make)
       run: make -j8 CFLAGS="-Werror -Wall -fsanitize=address" LDFLAGS="-fsanitize=address"
     - name: Run unit tests
-      run: ASAN_OPTIONS=detect_odr_violation=0 make -C tests/unit CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" check
+      run: make -C tests/unit CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" check
diff --git a/libpromises/evalfunction.c b/libpromises/evalfunction.c
@@ -10311,6 +10311,9 @@ static const FnCallArg DATATYPE_ARGS[] =
 
 /* see fncall.h enum FnCallType */
 
+/* In evalfunction_test.c we both include this file and link with libpromises.
+ * This guard makes sure we don't get a duplicate definition of this symbol */
+#ifndef CFENGINE_EVALFUNCTION_TEST_C
 const FnCallType CF_FNCALL_TYPES[] =
 {
     FnCallTypeNew("accessedbefore", CF_DATA_TYPE_CONTEXT, ACCESSEDBEFORE_ARGS, &FnCallIsAccessedBefore, "True if arg1 was accessed before arg2 (atime)",
@@ -10715,3 +10718,4 @@ const FnCallType CF_FNCALL_TYPES[] =
 
     FnCallTypeNewNull()
 };
+#endif // CFENGINE_EVALFUNCTION_TEST_C
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
@@ -176,6 +176,7 @@ if MACOSX
 XFAIL_TESTS = set_domainname_test
 XFAIL_TESTS += process_test
 XFAIL_TESTS += mon_processes_test
+XFAIL_TESTS += rlist_test
 endif
 
 if HPUX
@@ -246,18 +247,13 @@ db_concurrent_test_SOURCES = db_concurrent_test.c
 db_concurrent_test_LDADD = libtest.la libdb.la
 
 lastseen_test_SOURCES = lastseen_test.c \
-	../../libpromises/item_lib.c \
-	../../libpromises/lastseen.c \
 	../../libntech/libutils/statistics.c
 #lastseen_test_CPPFLAGS = $(libdb_la_CPPFLAGS)
-lastseen_test_LDADD = libtest.la libdb.la ../../libpromises/libpromises.la
+lastseen_test_LDADD = libtest.la ../../libpromises/libpromises.la
 
-lastseen_migration_test_SOURCES = lastseen_migration_test.c \
-	../../libpromises/lastseen.c \
-	../../libntech/libutils/statistics.c \
-	../../libpromises/item_lib.c
+lastseen_migration_test_SOURCES = lastseen_migration_test.c
 #lastseen_migration_test_CPPFLAGS = $(libdb_la_CPPFLAGS)
-lastseen_migration_test_LDADD = libdb.la ../../libpromises/libpromises.la
+lastseen_migration_test_LDADD = ../../libpromises/libpromises.la
 
 CLEANFILES = *.gcno *.gcda cfengine-enterprise.so
 
@@ -293,8 +289,7 @@ connection_management_test_LDADD = ../../libpromises/libpromises.la \
 	 libtest.la \
 	../../cf-serverd/libcf-serverd.la
 
-rlist_test_SOURCES = rlist_test.c \
-	../../libpromises/rlist.c
+rlist_test_SOURCES = rlist_test.c
 rlist_test_LDADD = libtest.la ../../libpromises/libpromises.la
 # Workaround for object file basename conflicts, search the web for
 # "automake created with both libtool and without"

diff --git a/tests/unit/evalfunction_test.c b/tests/unit/evalfunction_test.c
@@ -1,5 +1,9 @@
 #include <test.h>
 
+/* Protect against duplicate definition of symbol CF_FNCALL_TYPES since we are
+ * including evalfunction.c */
+#define CFENGINE_EVALFUNCTION_TEST_C
+
 #include <eval_context.h>
 #include <evalfunction.c>
 

diff --git a/tests/unit/lastseen_test.c b/tests/unit/lastseen_test.c
@@ -664,11 +664,7 @@ void FatalError(ARG_UNUSED char *s, ...)
     exit(42);
 }
 
-HashMethod CF_DEFAULT_DIGEST;
 pthread_mutex_t *cft_output;
-char VIPADDRESS[CF_MAX_IP_LEN];
-RSA *PUBKEY;
-bool MINUSF;
 
 char *HashPrintSafe(ARG_UNUSED char *dst, ARG_UNUSED size_t dst_size,
                     ARG_UNUSED const unsigned char *digest,

diff --git a/tests/unit/rlist_test.c b/tests/unit/rlist_test.c
@@ -825,7 +825,6 @@ const void *EvalContextVariableGet(const EvalContext *ctx, const VarRef *lval, D
     fail();
 }
 
-pthread_mutex_t *cft_lock;
 int __ThreadLock(pthread_mutex_t *name)
 {
     return true;

diff --git a/tests/unit/set_domainname_test.c b/tests/unit/set_domainname_test.c
@@ -7,11 +7,6 @@
 #include <rlist.h>
 #include <enterprise_extension.h>
 
-/* Global variables we care about */
-
-char VFQNAME[CF_MAXVARSIZE];
-char VUQNAME[CF_MAXVARSIZE / 2];
-char VDOMAIN[CF_MAXVARSIZE / 2];
 
 static struct hostent h = {
     .h_name = "laptop.intra.cfengine.com"
-Original file line number
+Diff line change
@@ Expand Up @@
         fail();
     }
-    pthread_mutex_t *cft_lock;
     int __ThreadLock(pthread_mutex_t *name)
     {
         return true;
@@ Expand Down @@