[openssh-commits] [openssh] 01/03: Move sanitizer logs into regress for collection.

git+noreply at mindrot.org git+noreply at mindrot.org
Tue Jul 5 18:38:16 AEST 2022


This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 55c60bdd39b82457e92efa77da8d16cfa6a49391
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Tue Jul 5 12:02:33 2022 +1000

    Move sanitizer logs into regress for collection.
---
 .github/configs             | 6 ++++--
 .github/workflows/c-cpp.yml | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/configs b/.github/configs
index d0ed7395..7ebb832e 100755
--- a/.github/configs
+++ b/.github/configs
@@ -43,6 +43,8 @@ case "$config" in
 	CONFIGFLAGS="--with-pam --with-Werror"
 	;;
     clang-sanitize-*)
+	# Put Sanitizer logs in regress dir.
+	SANLOGS=`pwd`/regress
 	# - We replace chroot with chdir so that the sanitizer in the preauth
 	#   privsep process can read /proc.
 	# - clang does not recognizes explicit_bzero so we use bzero
@@ -53,14 +55,14 @@ case "$config" in
 	clang-sanitize-address)
 	    CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
 	    LDFLAGS="-fsanitize=address"
-	    CPPFLAGS='-Dchroot=chdir -Dexplicit_bzero=bzero -DASAN_OPTIONS=\"detect_leaks=0:log_path=/tmp/asan.log\"'
+	    CPPFLAGS='-Dchroot=chdir -Dexplicit_bzero=bzero -DASAN_OPTIONS=\"detect_leaks=0:log_path='$SANLOGS'/asan.log\"'
 	    CONFIGFLAGS="--without-openssl --without-zlib --without-shadow"
 	    TEST_TARGET="t-exec"
 	    ;;
 	clang-sanitize-memory)
 	    CFLAGS="-fsanitize=memory -fsanitize-memory-track-origins"
 	    LDFLAGS="-fsanitize=memory"
-	    CPPFLAGS='-Dchroot=chdir -Dexplicit_bzero=bzero -DMSAN_OPTIONS=\"log_path=/tmp/msan.log\"'
+	    CPPFLAGS='-Dchroot=chdir -Dexplicit_bzero=bzero -DMSAN_OPTIONS=\"log_path='$SANLOGS'/msan.log\"'
 	    CONFIGFLAGS="--without-openssl --without-zlib --without-shadow"
 	    TEST_TARGET="t-exec"
 	    ;;
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index c8b8dbcd..a190a9d0 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -109,5 +109,5 @@ jobs:
           config.log
           regress/*.log
           regress/valgrind-out/
-          /tmp/asan.log.*
-          /tnp/msan.log.*
+          regress/asan.log.*
+          regress/msan.log.*

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list