[PATCH] test: Fix race condition in headers-*.sh

Lukas Fleischer lfleischer at lfos.de
Thu Jan 7 08:26:12 PST 2016


When running tests in parallel (e.g. using `make -j4 check`), the header
tests currently fail due to headers-overlay.sh and headers-system.sh
both generating headers-gen.c simultaneously, resulting in garbled
output. Fix this by using separate C files for the tests.

Signed-off-by: Lukas Fleischer <lfleischer at lfos.de>
---
 test/headers-overlay.sh | 6 +++---
 test/headers-system.sh  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/headers-overlay.sh b/test/headers-overlay.sh
index 56ce90d..be92eff 100755
--- a/test/headers-overlay.sh
+++ b/test/headers-overlay.sh
@@ -12,14 +12,14 @@ incdir="${top_srcdir}/include/bsd"
 CPPFLAGS="$CPPFLAGS -DLIBBSD_OVERLAY"
 
 for inc in $(cd $incdir; find -name '*.h' | sort | cut -c3-); do
-  cat >headers-gen.c <<SOURCE
+  cat >headers-overlay-gen.c <<SOURCE
 #include <$inc>
 int main() { return 0; }
 SOURCE
 
   echo "testing header $inc"
-  run $CC -isystem "$incdir" $CPPFLAGS headers-gen.c -o /dev/null
+  run $CC -isystem "$incdir" $CPPFLAGS headers-overlay-gen.c -o /dev/null
   echo
 
-  rm -f headers-gen*
+  rm -f headers-overlay-gen*
 done
diff --git a/test/headers-system.sh b/test/headers-system.sh
index 173fcc5..5ff0517 100755
--- a/test/headers-system.sh
+++ b/test/headers-system.sh
@@ -11,14 +11,14 @@ run()
 incdir="${top_srcdir}/include"
 
 for inc in $(cd $incdir; find -name '*.h' | sort | cut -c3-); do
-  cat >headers-gen.c <<SOURCE
+  cat >headers-system-gen.c <<SOURCE
 #include <$inc>
 int main() { return 0; }
 SOURCE
 
   echo "testing header $inc"
-  run $CC -isystem "$incdir" $CPPFLAGS headers-gen.c -o /dev/null
+  run $CC -isystem "$incdir" $CPPFLAGS headers-system-gen.c -o /dev/null
   echo
 
-  rm -f headers-gen.*
+  rm -f headers-system-gen.*
 done
-- 
2.7.0



More information about the libbsd mailing list