Skip to content

Commit 0c12a51

Browse files
committed
fix to benchmark script
1 parent 2082e4e commit 0c12a51

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

tests/post-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ else
1717
show_logs=1
1818
fi
1919

20-
if [ $1 -ne "0" ]; then
20+
if [ "$1" -ne "0" ]; then
2121
echo "The test didn't seem to succeed"
2222
show_logs=1
2323
fi
2424

25-
if [ $show_logs -ne 0 ]; then
25+
if [ "$show_logs" -ne 0 ]; then
2626
echo "Mofka stderr ===================================="
2727
cat mofka.err
2828
echo "Mofka stdout ===================================="

tests/run-benchmark.sh

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ echo "{\"group_file\":\"mofka.json\", \"margo\":{\"use_progress_thread\":true}}"
88

99
echo "==> Creating topic"
1010
python -m mochi.mofka.mofkactl topic create my_topic -g mofka.json
11-
if [ "$?" -ne 0 ]; then
12-
$HERE/post-test.sh
11+
r="$?"
12+
if [ "$r" -ne "0" ]; then
13+
$HERE/post-test.sh $r
1314
exit 1
1415
fi
1516

1617
echo "==> Adding memory partition"
1718
python -m mochi.mofka.mofkactl partition add my_topic -r 0 -t memory -g mofka.json
18-
if [ "$?" -ne 0 ]; then
19-
$HERE/post-test.sh
19+
r="$?"
20+
if [ "$r" -ne "0" ]; then
21+
$HERE/post-test.sh $r
2022
exit 1
2123
fi
2224

@@ -30,8 +32,9 @@ diaspora-producer-benchmark -d mofka \
3032
-b 8 \
3133
-f 10 \
3234
-p 1
33-
if [ "$?" -ne 0 ]; then
34-
$HERE/post-test.sh
35+
r="$?"
36+
if [ "$r" -ne "0" ]; then
37+
$HERE/post-test.sh $r
3538
exit 1
3639
fi
3740

@@ -43,9 +46,10 @@ diaspora-consumer-benchmark -d mofka \
4346
-s 0.5 \
4447
-i 0.8 \
4548
-p 1
46-
if [ "$?" -ne 0 ]; then
47-
$HERE/post-test.sh
49+
r="$?"
50+
if [ "$r" -ne "0" ]; then
51+
$HERE/post-test.sh $r
4852
exit 1
4953
fi
5054

51-
$HERE/post-test.sh
55+
$HERE/post-test.sh 0

tests/spack.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ spack:
6666
mpi:
6767
require:
6868
- mpich
69+
python:
70+
require:
71+
- "@3.13.0:"
6972
mercury:
7073
require: "~checksum~boostsys"
7174
libfabric:

0 commit comments

Comments
 (0)