Fix tests

rule_field_matches_string failed because it relied on UB as discussed in #1171
dunst-project · Jan 24, 2025 · 03303ab · 03303ab
1 parent 298c3a7
commit 03303ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,6 +73,7 @@ jobs:
     env:
       CC: gcc
       EXTRA_CFLAGS: "-Werror"
+      MAKE: gmake
 
     steps:
       - uses: actions/checkout@v4
@@ -82,7 +83,7 @@ jobs:
       - name: Test in FreeBSD
         uses: vmactions/freebsd-vm@v1
         with:
-          envs: "CC EXTRA_CFLAGS"
+          envs: "CC EXTRA_CFLAGS MAKE"
           usesh: true
           sync: rsync
           copyback: false
@@ -101,7 +102,7 @@ jobs:
             ./test/test-install.sh
 
             echo "* Run valgrind test"
-            gmake clean && gmake -j test-valgrind
+            gmake -j test-valgrind
 
   doxygen:
     steps:

diff --git a/src/rules.c b/src/rules.c
@@ -282,6 +282,7 @@ static inline bool rule_field_matches_string(const char *value, const char *patt
                 }
                 regex_t     regex;
 
+                // TODO check if regex pattern is not empty
                 // TODO compile each regex only once
                 int err = regcomp(&regex, pattern, REG_NEWLINE | REG_EXTENDED | REG_NOSUB);
                 if (err) {

diff --git a/test/rules.c b/test/rules.c
@@ -41,7 +41,6 @@ TEST test_pattern_match(void) {
                 ASSERT(rule_field_matches_string("ffffasd", ".*asd"));
 
                 // Substring matching
-                ASSERT(rule_field_matches_string("asd", ""));
                 ASSERT(rule_field_matches_string("asd", "sd"));
                 ASSERT(rule_field_matches_string("asd", "a"));
                 ASSERT(rule_field_matches_string("asd", "d"));

diff --git a/test/test-install.sh b/test/test-install.sh
@@ -3,6 +3,8 @@
 # Throw error any time a command fails
 set -euo pipefail
 
+MAKE=${MAKE:-make}
+
 # Export parameters so they are useable by subshells and make
 export BASE="$(dirname "$(dirname "$(readlink -f "$0")")")"
 export DESTDIR="${BASE}/install"
@@ -14,7 +16,7 @@ export SERVICEDIR_SYSTEMD="/systemd"
 export SERVICEDIR_DBUS="/dbus"
 
 do_make() {  # for convenience/conciseness
-	make -C "${BASE}" "$@"
+	${MAKE} -C "${BASE}" "$@"
 }
 
 check_dest() {