Merge pull request #128 from rhusar/testsuite-log-suffix

Fix non-standard log file extension to *.log files.
modcluster · Aug 10, 2023 · 7767403 · 7767403
2 parents 5c2933e + fd5c15c
commit 7767403
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@
 .vscode/
 
 # Native built files
-native/*/*.log
 native/*/*.slo
 native/*/*.so
 native/*/*.lo
@@ -34,8 +33,8 @@ target/
 # war files (usually in tests)
 **/*.war
 
-# test logs
-**/*.logs
+# Log files
+**/*.log
 
 # test nohup files
 **/nohup.out
diff --git a/test/includes/common.sh b/test/includes/common.sh
@@ -12,7 +12,7 @@ run_test() {
         printf "Running %-42s ..." $1
     fi
     if [ $DEBUG ]; then
-        sh $1 > "logs/${2:-$1}.logs" 2>&1
+        sh $1 > "logs/${2:-$1}.log" 2>&1
     else
         sh $1 > /dev/null 2>&1
     fi
@@ -24,7 +24,7 @@ run_test() {
     fi
     # preserve httpd's logs too if DEBUG
     if [ $DEBUG ]; then
-        docker logs $(docker ps -a | grep $HTTPD_IMG | cut -f 1 -d' ') > "logs/${2:-$1}-httpd.logs" 2>&1
+        docker logs $(docker ps -a | grep $HTTPD_IMG | cut -f 1 -d' ') > "logs/${2:-$1}-httpd.log" 2>&1
     fi
     # Clean all after run
     httpd_shutdown > /dev/null 2>&1