Karel Zak 42def0
From 331c5e0c54d9cb6f67dc3e825eec2d78c67d8ce6 Mon Sep 17 00:00:00 2001
Karel Zak 42def0
From: Karel Zak <kzak@redhat.com>
Karel Zak 42def0
Date: Mon, 23 Aug 2021 15:15:38 +0200
Karel Zak 42def0
Subject: [PATCH 1/2] tests: make ./run.sh more robust
Karel Zak 42def0
Karel Zak 42def0
Signed-off-by: Karel Zak <kzak@redhat.com>
Karel Zak 42def0
---
Karel Zak 42def0
 tests/run.sh | 2 +-
Karel Zak 42def0
 1 file changed, 1 insertion(+), 1 deletion(-)
Karel Zak 42def0
Karel Zak 42def0
diff --git a/tests/run.sh b/tests/run.sh
Karel Zak 42def0
index 9d26406c4..d020bfe88 100755
Karel Zak 42def0
--- a/tests/run.sh
Karel Zak 42def0
+++ b/tests/run.sh
Karel Zak 42def0
@@ -165,7 +165,7 @@ OPTS="$OPTS --srcdir=$top_srcdir --builddir=$top_builddir"
Karel Zak 42def0
 if [ -z "$has_asan_opt" ]; then
Karel Zak 42def0
         if [ -e "$top_builddir/Makefile" ]; then
Karel Zak 42def0
 	    asan=$(awk '/^ASAN_LDFLAGS/ { print $3 }' $top_builddir/Makefile)
Karel Zak 42def0
-        else
Karel Zak 42def0
+        elif [ -f "$top_builddir/meson.conf" ]; then
Karel Zak 42def0
             . "$top_builddir/meson.conf"
Karel Zak 42def0
         fi
Karel Zak 42def0
 	if [ -n "$asan" ]; then
Karel Zak 42def0
-- 
Karel Zak 42def0
2.31.1
Karel Zak 42def0