From 6ae725a168a7fab6347053c3ddaa8a62116c3dce Mon Sep 17 00:00:00 2001
From: lche0021 <lche0021@student.monash.edu>
Date: Wed, 2 Dec 2020 20:47:36 +1100
Subject: [PATCH] fix bug in smoke_test where name/ver being empty
---
smoke_test/generate_bin_test | 2 +-
smoke_test/smoke_test | 9 +++++++++
smoke_test/software_usage.txt | 2 --
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/smoke_test/generate_bin_test b/smoke_test/generate_bin_test
index de567fa8..a4462cb2 100755
--- a/smoke_test/generate_bin_test
+++ b/smoke_test/generate_bin_test
@@ -1,5 +1,5 @@
#!/bin/bash
-NUM_MODULE=${2:-100}
+NUM_MODULE=${1:-100}
TESTCASE_DIR='./tests'
diff --git a/smoke_test/smoke_test b/smoke_test/smoke_test
index 9cffca72..80f1aa02 100755
--- a/smoke_test/smoke_test
+++ b/smoke_test/smoke_test
@@ -33,10 +33,18 @@ fi
declare -a modules
IFS_orig=$IFS
IFS=$'\n'
+
for i in $(head -n $NUM_MODULE $USAGE_REPORT); do
m=$(sed -n 's/\(.*\)\/\(.*\) - \(.*\)/\1 \2/p' <<< $i)
name=$(cut -f1 -d' ' <<< $m)
ver=$(cut -f2 -d' ' <<< $m)
+ printf "\n\n=========================\n"
+ if [ -z $name ]; then
+ continue
+ fi
+
+ echo "Testing $name/$ver ... "
+
module load $name/$ver
mkdir -p $OUTPUT_DIR/$name
echo '' > $OUTPUT_DIR/$name/$ver
@@ -65,6 +73,7 @@ for i in $(head -n $NUM_MODULE $USAGE_REPORT); do
done
fi
module purge
+ printf "Done"
done
IFS=$IFS_orig
diff --git a/smoke_test/software_usage.txt b/smoke_test/software_usage.txt
index 31683218..f0dd51a9 100644
--- a/smoke_test/software_usage.txt
+++ b/smoke_test/software_usage.txt
@@ -4,7 +4,6 @@ virtualgl/2.5.0 - 5586
tigervnc/1.8.0 - 5061
openmpi/1.10.7-mlx - 2368
gcc/8.1.0 - 2162
-java/1.8.0_77 - 2108
gcc/4.9.3 - 2063
anaconda/5.1.0-Python3.6-gcc5 - 1635
openblas/0.2.20 - 1510
@@ -78,7 +77,6 @@ mesa/default - 343
blast/2.7.1 - 338
boost/1.67.0-gcc5 - 330
freesurfer/6.0 - 327
-dot - 327
fsl/6.0.1 - 320
python/3.5.2-gcc4 - 316
matlab/r2015b - 315
--
GitLab