Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: "saranyamohan via sendgmr" 
        <saranyamohan@saranyamohan.svl.corp.google.com>
Date:   Wed, 18 Nov 2020 07:39:39 -0800
In-Reply-To: <20201118153947.3394530-1-saranyamohan@google.com>
Message-Id: <20201118153947.3394530-54-saranyamohan@google.com>
Mime-Version: 1.0
References: <20201118153947.3394530-1-saranyamohan@google.com>
Subject: [RFC PATCH v3 53/61] e2fsck: fix f_multithread_ok test
From:   Saranya Muruganandam <saranyamohan@google.com>
To:     linux-ext4@vger.kernel.org, tytso@mit.edu
Cc:     adilger.kernel@dilger.ca, Andreas Dilger <adilger@whamcloud.com>,
        Saranya Muruganandam <saranyamohan@google.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

From: Andreas Dilger <adilger@whamcloud.com>

Don't use $OUT for both the input amd output of a pipeline,
as the output file is truncated befor the input is read.

Fix the handling in the failure case to generate the
*.failed file, and print the actual $test_name instead
of "test_name".

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Saranya Muruganandam <saranyamohan@google.com>
---
 tests/f_multithread_ok/script | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/f_multithread_ok/script b/tests/f_multithread_ok/script
index 4010881b..c62c93ce 100644
--- a/tests/f_multithread_ok/script
+++ b/tests/f_multithread_ok/script
@@ -5,15 +5,15 @@ SKIP_CLEANUP="true"
 
 . $cmd_dir/run_e2fsck
 
-cat $OUT1 | grep -v Thread > $OUT1
-rm -f $test_name.ok $test_name.failed
-cmp -s $OUT1 $EXP1
+grep -v Thread $OUT1 > $OUT1.tmp
+cmp -s $OUT1.tmp $EXP1
 status1=$?
 if [ "$status1" -eq 0 ]; then
 	echo "$test_name: $test_description: ok"
 	touch $test_name.ok
 else
-	echo "test_name: $test_description: failed"
+	echo "$test_name: $test_description: failed"
+	cmp $OUT1.tmp $EXP1 > $test_name.failed
 fi
 
 unset IMAGE FSCK_OPT SECOND_FSCK_OPT OUT1 OUT2 EXP1 EXP2 
-- 
2.29.2.299.gdc1121823c-goog