From 60555884a131e42c1ec2170904bd70b76a5cf112 Mon Sep 17 00:00:00 2001
From: Joakim Bech <joakim.bech@gmail.com>
Date: Sat, 21 Jan 2023 16:37:38 +0100
Subject: [PATCH] list: fix segmentation fault when using --list

The tauPrintf command doesn't have curly brackets, hence we get an
undesired behavior, since single line 'tauPrintf' lines actually isn't
single line commands. To fix, this wrap the tauPrintf macro in curly
brackets.

The 'list' command should only list the tests and then return, beside
the segmentation fault, it would first list the commands and then run
all tests, which probably isn't the desired result of running '--list'.

Here we simply set a variable that tells us to return as soon as we have
returned from parsing routine that also displays the tests.
---
 tau/tau.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tau/tau.h b/tau/tau.h
index f3e62b3..e9e8e02 100644
--- a/tau/tau.h
+++ b/tau/tau.h
@@ -125,6 +125,7 @@ extern tau_u64 tauStatsNumWarnings;
 static int tauShouldColourizeOutput = 1;
 static int tauDisableSummary = 0;
 static int tauDisplayOnlyFailedOutput = 0;
+static int tauDisplayTests = 0;
 
 static const char* tau_argv0_ = TAU_NULL;
 static const char* cmd_filter = TAU_NULL;
@@ -415,10 +416,11 @@ tauColouredPrintf(const int colour, const char* const fmt, ...) {
 }
 
 #ifndef TAU_NO_TESTING
-    #define tauPrintf(...)                                  \
+    #define tauPrintf(...) {                                \
         if(tauTestContext.foutput)                          \
             fprintf(tauTestContext.foutput, __VA_ARGS__);   \
-        printf(__VA_ARGS__)
+        printf(__VA_ARGS__);                                \
+    }
 #else
     #define tauPrintf(...)   \
         printf(__VA_ARGS__)
@@ -1066,6 +1068,7 @@ static tau_bool tauCmdLineRead(const int argc, const char* const * const argv) {
         else if(strncmp(argv[i], listStr, strlen(listStr)) == 0) {
             for (i = 0; i < tauTestContext.numTestSuites; i++)
                 tauPrintf("%s\n", tauTestContext.tests[i].name);
+            tauDisplayTests = 1;
         }
 
         // Disable colouring
@@ -1164,6 +1167,9 @@ inline int tau_main(const int argc, const char* const * const argv) {
     const double start = tauClock();
 
     const tau_bool wasCmdLineReadSuccessful = tauCmdLineRead(argc, argv);
+    if (tauDisplayTests)
+        return tauCleanup();
+
     if(!wasCmdLineReadSuccessful)
         return tauCleanup();