Skip to content

Commit 90b0b06

Browse files
wkliaowkliao
committedApr 3, 2024
ROMIO: use executable name as part of output file name
·
v4.3.0v4.3.0b1
1 parent 6e1e892 commit 90b0b06

File tree

1 file changed

+12
-28
lines changed

1 file changed

+12
-28
lines changed
 

‎src/mpi/romio/test/runtests.in

+12-28
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ MAKE="@MAKE@"
2222
srcdir=@srcdir@
2323
check_canrun=0
2424
subset_only=0
25-
FILENAME=test
25+
PREFIX_FILENAME=
26+
FILENAME=
2627
# Using shifts should remove args from the list.
2728
for arg in "$@" ; do
2829
case $arg in
@@ -55,15 +56,15 @@ for arg in "$@" ; do
5556
subset_only=1
5657
;;
5758
-fname=*)
58-
FILENAME=`echo $arg|sed 's/-*fname=//'`
59+
PREFIX_FILENAME=`echo $arg|sed 's/-*fname=//'`
5960
;;
6061
-atend)
6162
shift
6263
check_at_once=0
6364
;;
6465
-help|-u)
6566
shift
66-
echo "runtests [-fname=FILENAME] [-checkonly] [-atend] [-check]"
67+
echo "runtests [-fname=FILENAME_PREFIX] [-checkonly] [-atend] [-check]"
6768
echo "run tests in this directory. If -checkonly set, just run"
6869
echo "the differences check (do NOT rerun the test programs)."
6970
echo "If -small is used, the examples are built, run, and deleted."
@@ -84,6 +85,10 @@ for arg in "$@" ; do
8485
esac
8586
done
8687

88+
if ["$PREFIX_FILENAME" = ""] ; then
89+
PREFIX_FILENAME="romio_test_"
90+
fi
91+
8792
# MakeExe program-name
8893
MakeExe() {
8994
if [ -s $STOPFILE ] ; then
@@ -97,12 +102,16 @@ MakeExe() {
97102
exit 1
98103
fi
99104
fi
105+
FILENAME="${PREFIX_FILENAME}$1"
106+
\rm -f $FILENAME*
100107
}
108+
101109
# CleanExe program-name
102110
CleanExe() {
103111
if [ $makeeach = 1 ] ; then
104112
rm -f $1 $1.o
105113
fi
114+
\rm -f $FILENAME*
106115
}
107116
# Output marker
108117
OutTime() {
@@ -176,7 +185,6 @@ OutTime
176185
testfiles="$testfiles simple.out"
177186
\rm -f simple.out
178187
MakeExe simple
179-
\rm -f $FILENAME*
180188
echo '**** Testing simple.c ****'
181189
$mpirun -np 4 ./simple -fname $FILENAME
182190
# CheckOutput simple
@@ -186,7 +194,6 @@ OutTime
186194
testfiles="$testfiles async.out"
187195
\rm -f async.out
188196
MakeExe async
189-
\rm -f $FILENAME*
190197
echo '**** Testing async.c ****'
191198
$mpirun -np 4 ./async -fname $FILENAME
192199
# CheckOutput async
@@ -196,7 +203,6 @@ OutTime
196203
testfiles="$testfiles async-multi.out"
197204
\rm -f async-multi.out
198205
MakeExe async-multiple
199-
\rm -f $FILENAME*
200206
echo '**** Testing async-multiple.c ****'
201207
$mpirun -np 4 ./async-multiple -fname $FILENAME
202208
# CheckOutput async-multiple
@@ -207,7 +213,6 @@ if [ $subset_only -eq 0 ] ; then
207213
testfiles="$testfiles atomicity.out"
208214
\rm -f atomicity.out
209215
MakeExe atomicity
210-
\rm -f $FILENAME*
211216
echo '**** Testing atomicity.c ****'
212217
# Atomicity test recommends at least 8 processes (separate processors
213218
# even better)
@@ -220,7 +225,6 @@ fi
220225
testfiles="$testfiles coll_test.out"
221226
\rm -f coll_test.out
222227
MakeExe coll_test
223-
\rm -f $FILENAME*
224228
echo '**** Testing coll_test.c ****'
225229
$mpirun -np 4 ./coll_test -fname $FILENAME
226230
# CheckOutput coll_test
@@ -230,7 +234,6 @@ OutTime
230234
testfiles="$testfiles excl.out"
231235
\rm -f excl.out
232236
MakeExe excl
233-
\rm -f $FILENAME*
234237
echo '**** Testing excl.c ****'
235238
$mpirun -np 4 ./excl -fname $FILENAME
236239
# CheckOutput excl
@@ -239,7 +242,6 @@ CleanExe excl
239242
testfiles="$testfiles file_info.out"
240243
\rm -f file_info.out
241244
MakeExe file_info
242-
\rm -f $FILENAME*
243245
for fs in @FILE_SYSTEM@ ; do
244246
OutTime
245247
echo "**** Testing file_info.c - file system = $fs ****"
@@ -260,7 +262,6 @@ OutTime
260262
testfiles="$testfiles i_noncontig.out"
261263
\rm -f i_noncontig.out
262264
MakeExe i_noncontig
263-
\rm -f $FILENAME*
264265
echo '**** Testing i_noncontig.c ****'
265266
$mpirun -np 2 ./i_noncontig -fname $FILENAME
266267
# CheckOutput i_noncontig
@@ -270,7 +271,6 @@ OutTime
270271
testfiles="$testfiles noncontig.out"
271272
\rm -f noncontig.out
272273
MakeExe noncontig
273-
\rm -f $FILENAME*
274274
echo '**** Testing noncontig.c ****'
275275
$mpirun -np 2 ./noncontig -fname $FILENAME
276276
# CheckOutput noncontig
@@ -280,7 +280,6 @@ OutTime
280280
testfiles="$testfiles noncontig_coll.out"
281281
\rm -f noncontig_coll.out
282282
MakeExe noncontig_coll
283-
\rm -f $FILENAME*
284283
echo '**** Testing noncontig_coll.c ****'
285284
$mpirun -np 2 ./noncontig_coll -fname $FILENAME
286285
# CheckOutput noncontig_coll
@@ -290,7 +289,6 @@ OutTime
290289
testfiles="$testfiles noncontig_coll2.out"
291290
\rm -f noncontig_coll2.out
292291
MakeExe noncontig_coll2
293-
\rm -f $FILENAME*
294292
echo '**** Testing noncontig_coll2.c ****'
295293
$mpirun -np 4 ./noncontig_coll2 -fname $FILENAME
296294
# CheckOutput noncontig_coll2
@@ -326,7 +324,6 @@ if [ $subset_only -eq 0 ] ; then
326324
testfiles="$testfiles misc.out"
327325
\rm -f misc.out
328326
MakeExe misc
329-
\rm -f $FILENAME*
330327
echo '**** Testing misc.c ****'
331328
$mpirun -np 4 ./misc -fname $FILENAME
332329
# CheckOutput misc
@@ -338,7 +335,6 @@ if [ $subset_only -eq 0 ] ; then
338335
testfiles="$testfiles shared_fp.out"
339336
\rm -f shared_fp.out
340337
MakeExe shared_fp
341-
\rm -f $FILENAME*
342338
echo '**** Testing shared_fp.c ****'
343339
$mpirun -np 4 ./shared_fp -fname $FILENAME
344340
# CheckOutput shared_fp
@@ -348,7 +344,6 @@ if [ $subset_only -eq 0 ] ; then
348344
testfiles="$testfiles ordered_fp.out"
349345
\rm -f ordered_fp.out
350346
MakeExe ordered_fp
351-
\rm -f $FILENAME*
352347
echo '**** Testing ordered_fp.c ****'
353348
$mpirun -np 4 ./ordered_fp -fname $FILENAME
354349
CleanExe ordered_fp
@@ -358,7 +353,6 @@ fi
358353
testfiles="$testfiles split_coll.out"
359354
\rm -f split_coll.out
360355
MakeExe split_coll
361-
\rm -f $FILENAME*
362356
echo '**** Testing split_coll.c ****'
363357
$mpirun -np 4 ./split_coll -fname $FILENAME
364358
# CheckOutput split_coll
@@ -369,7 +363,6 @@ if [ @NOPROFILE@ = 0 ] ; then
369363
testfiles="$testfiles psimple.out"
370364
\rm -f psimple.out
371365
MakeExe psimple
372-
\rm -f $FILENAME*
373366
echo '**** Testing psimple.c ****'
374367
$mpirun -np 4 ./psimple -fname $FILENAME
375368
# CheckOutput psimple
@@ -380,7 +373,6 @@ OutTime
380373
testfiles="$testfiles error.out"
381374
\rm -f error.out
382375
MakeExe error
383-
\rm -f $FILENAME*
384376
echo '**** Testing error.c ****'
385377
$mpirun -np 1 ./error -fname $FILENAME
386378
# CheckOutput error
@@ -390,7 +382,6 @@ OutTime
390382
testfiles="$testfiles status.out"
391383
\rm -f status.out
392384
MakeExe status
393-
\rm -f $FILENAME*
394385
echo '**** Testing status.c ****'
395386
# Some systems have a status program.
396387
$mpirun -np 1 ./status -fname $FILENAME
@@ -400,19 +391,16 @@ OutTime
400391
testfiles="$testfiles types_with_zeros.out"
401392
\rm -f types_with_zeros.out
402393
MakeExe types_with_zeros
403-
\rm -f $FILENAME*
404394
echo '**** Testing types_with_zeros ****'
405395
$mpirun -np 2 ./types_with_zeros $FILENAME
406396
CleanExe types_with_zeros
407397
OutTime
408398
testfiles="$testfiles darray_read.out"
409399
\rm -f darray_read.out
410400
MakeExe darray_read
411-
\rm -f $FILENAME*
412401
echo '**** Testing darray_read ****'
413402
$mpirun -np 4 ./darray_read $FILENAME
414403
CleanExe darray_read
415-
\rm -f $FILENAME*
416404
OutTime
417405
MakeExe syshints
418406
echo '**** Testing syshints ****'
@@ -434,7 +422,6 @@ if [ @NOF77@ = 0 ] ; then
434422
testfiles="$testfiles fmisc.out"
435423
\rm -f fmisc.out
436424
MakeExe fmisc
437-
\rm -f $FILENAME*
438425
echo '**** Testing fmisc.f ****'
439426
$mpirun -np 4 ./fmisc -fname $FILENAME
440427
# CheckOutput fmisc
@@ -445,7 +432,6 @@ if [ @NOF77@ = 0 ] ; then
445432
testfiles="$testfiles fcoll_test.out"
446433
\rm -f fcoll_test.out
447434
MakeExe fcoll_test
448-
\rm -f $FILENAME*
449435
echo '**** Testing fcoll_test.f ****'
450436
$mpirun -np 4 ./fcoll_test -fname $FILENAME
451437
# CheckOutput fcoll_test
@@ -455,12 +441,10 @@ if [ @NOF77@ = 0 ] ; then
455441
testfiles="$testfiles pfcoll_test.out"
456442
\rm -f pfcoll_test.out
457443
MakeExe pfcoll_test
458-
\rm -f $FILENAME*
459444
echo '**** Testing pfcoll_test.f ****'
460445
$mpirun -np 4 ./pfcoll_test -fname $FILENAME
461446
# CheckOutput pfcoll_test
462447
CleanExe pfcoll_test
463-
\rm -f $FILENAME*
464448
#
465449
echo ""
466450
fi

0 commit comments

Comments
 (0)
Please sign in to comment.