Skip to content

Commit 5a79446

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #4918 from HaoZeke/testFixes
TST,BUG: Explicitly allow running tests multiple times
2 parents e0ad20f + d9f368d commit 5a79446

File tree

16 files changed

+119
-88
lines changed

16 files changed

+119
-88
lines changed

‎ctest/c_cblat1.f‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@ PROGRAM CCBLAT1
3838
CALL CHECK1(SFAC)
3939
END IF
4040
* -- Print
41-
IF (PASS) WRITE (NOUT,99998)
41+
IF (PASS) THEN
42+
WRITE (NOUT,99998)
43+
ELSE
44+
CALL ABORT
45+
END IF
4246
20 CONTINUE
43-
STOP
4447
*
4548
99999 FORMAT (' Complex CBLAS Test Program Results',/1X)
4649
99998 FORMAT (' ----- PASS -----')
@@ -228,7 +231,7 @@ SUBROUTINE CHECK1(SFAC)
228231
CALL ITEST1(ICAMAXTEST(N,CX,INCX),ITRUE3(NP1))
229232
ELSE
230233
WRITE (NOUT,*) ' Shouldn''t be here in CHECK1'
231-
STOP
234+
CALL ABORT
232235
END IF
233236
*
234237
40 CONTINUE
@@ -512,7 +515,7 @@ SUBROUTINE CHECK2(SFAC)
512515
CALL CTEST(LENY,CY,CT10Y(1,KN,KI),CSIZE3,1.0E0)
513516
ELSE
514517
WRITE (NOUT,*) ' Shouldn''t be here in CHECK2'
515-
STOP
518+
CALL ABORT
516519
END IF
517520
*
518521
40 CONTINUE

‎ctest/c_cblat2.f‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PROGRAM CBLAT2
1010
* 'CBLAT2.SNAP' NAME OF SNAPSHOT OUTPUT FILE
1111
* -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0)
1212
* F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD.
13-
* F LOGICAL FLAG, T TO STOP ON FAILURES.
13+
* F LOGICAL FLAG, T TO CALL ABORT ON FAILURES.
1414
* T LOGICAL FLAG, T TO TEST ERROR EXITS.
1515
* 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH
1616
* 16.0 THRESHOLD VALUE OF TEST RATIO
@@ -243,7 +243,7 @@ PROGRAM CBLAT2
243243
$ GO TO 70
244244
60 CONTINUE
245245
WRITE( NOUT, FMT = 9986 )SNAMET
246-
STOP
246+
CALL ABORT
247247
70 LTEST( I ) = LTESTT
248248
GO TO 50
249249
*
@@ -283,15 +283,15 @@ PROGRAM CBLAT2
283283
SAME = LCE( YY, YT, N )
284284
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
285285
WRITE( NOUT, FMT = 9985 )TRANS, SAME, ERR
286-
STOP
286+
CALL ABORT
287287
END IF
288288
TRANS = 'T'
289289
CALL CMVCH( TRANS, N, N, ONE, A, NMAX, X, -1, ZERO, Y, -1, YT, G,
290290
$ YY, EPS, ERR, FATAL, NOUT, .TRUE. )
291291
SAME = LCE( YY, YT, N )
292292
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
293293
WRITE( NOUT, FMT = 9985 )TRANS, SAME, ERR
294-
STOP
294+
CALL ABORT
295295
END IF
296296
*
297297
* Test each subroutine in turn.
@@ -418,7 +418,9 @@ PROGRAM CBLAT2
418418
IF( TRACE )
419419
$ CLOSE ( NTRA )
420420
CLOSE ( NOUT )
421-
STOP
421+
IF( FATAL ) THEN
422+
CALL ABORT
423+
END IF
422424
*
423425
10002 FORMAT( ' COLUMN-MAJOR AND ROW-MAJOR DATA LAYOUTS ARE TESTED' )
424426
10001 FORMAT( ' ROW-MAJOR DATA LAYOUT IS TESTED' )

‎ctest/c_cblat3.f‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PROGRAM CBLAT3
1010
* 'CBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE
1111
* -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0)
1212
* F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD.
13-
* F LOGICAL FLAG, T TO STOP ON FAILURES.
13+
* F LOGICAL FLAG, T TO CALL ABORT ON FAILURES.
1414
* T LOGICAL FLAG, T TO TEST ERROR EXITS.
1515
* 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH
1616
* 16.0 THRESHOLD VALUE OF TEST RATIO
@@ -194,7 +194,7 @@ PROGRAM CBLAT3
194194
$ GO TO 50
195195
40 CONTINUE
196196
WRITE( NOUT, FMT = 9990 )SNAMET
197-
STOP
197+
CALL ABORT
198198
50 LTEST( I ) = LTESTT
199199
GO TO 30
200200
*
@@ -237,7 +237,7 @@ PROGRAM CBLAT3
237237
SAME = LCE( CC, CT, N )
238238
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
239239
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
240-
STOP
240+
CALL ABORT
241241
END IF
242242
TRANSB = 'C'
243243
CALL CMMCH( TRANSA, TRANSB, N, 1, N, ONE, AB, NMAX,
@@ -246,7 +246,7 @@ PROGRAM CBLAT3
246246
SAME = LCE( CC, CT, N )
247247
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
248248
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
249-
STOP
249+
CALL ABORT
250250
END IF
251251
DO 120 J = 1, N
252252
AB( J, NMAX + 1 ) = N - J + 1
@@ -264,7 +264,7 @@ PROGRAM CBLAT3
264264
SAME = LCE( CC, CT, N )
265265
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
266266
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
267-
STOP
267+
CALL ABORT
268268
END IF
269269
TRANSB = 'C'
270270
CALL CMMCH( TRANSA, TRANSB, N, 1, N, ONE, AB, NMAX,
@@ -273,7 +273,7 @@ PROGRAM CBLAT3
273273
SAME = LCE( CC, CT, N )
274274
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
275275
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
276-
STOP
276+
CALL ABORT
277277
END IF
278278
*
279279
* Test each subroutine in turn.
@@ -385,7 +385,9 @@ PROGRAM CBLAT3
385385
IF( TRACE )
386386
$ CLOSE ( NTRA )
387387
CLOSE ( NOUT )
388-
STOP
388+
IF( FATAL ) THEN
389+
CALL ABORT
390+
END IF
389391
*
390392
10002 FORMAT( ' COLUMN-MAJOR AND ROW-MAJOR DATA LAYOUTS ARE TESTED' )
391393
10001 FORMAT(' ROW-MAJOR DATA LAYOUT IS TESTED' )

‎ctest/c_cblat3_3m.f‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PROGRAM CBLAT3
1010
* 'CBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE
1111
* -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0)
1212
* F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD.
13-
* F LOGICAL FLAG, T TO STOP ON FAILURES.
13+
* F LOGICAL FLAG, T TO CALL ABORT ON FAILURES.
1414
* T LOGICAL FLAG, T TO TEST ERROR EXITS.
1515
* 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH
1616
* 16.0 THRESHOLD VALUE OF TEST RATIO
@@ -194,7 +194,7 @@ PROGRAM CBLAT3
194194
$ GO TO 50
195195
40 CONTINUE
196196
WRITE( NOUT, FMT = 9990 )SNAMET
197-
STOP
197+
CALL ABORT
198198
50 LTEST( I ) = LTESTT
199199
GO TO 30
200200
*
@@ -237,7 +237,7 @@ PROGRAM CBLAT3
237237
SAME = LCE( CC, CT, N )
238238
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
239239
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
240-
STOP
240+
CALL ABORT
241241
END IF
242242
TRANSB = 'C'
243243
CALL CMMCH( TRANSA, TRANSB, N, 1, N, ONE, AB, NMAX,
@@ -246,7 +246,7 @@ PROGRAM CBLAT3
246246
SAME = LCE( CC, CT, N )
247247
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
248248
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
249-
STOP
249+
CALL ABORT
250250
END IF
251251
DO 120 J = 1, N
252252
AB( J, NMAX + 1 ) = N - J + 1
@@ -264,7 +264,7 @@ PROGRAM CBLAT3
264264
SAME = LCE( CC, CT, N )
265265
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
266266
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
267-
STOP
267+
CALL ABORT
268268
END IF
269269
TRANSB = 'C'
270270
CALL CMMCH( TRANSA, TRANSB, N, 1, N, ONE, AB, NMAX,
@@ -273,7 +273,7 @@ PROGRAM CBLAT3
273273
SAME = LCE( CC, CT, N )
274274
IF( .NOT.SAME.OR.ERR.NE.RZERO )THEN
275275
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
276-
STOP
276+
CALL ABORT
277277
END IF
278278
*
279279
* Test each subroutine in turn.
@@ -385,7 +385,9 @@ PROGRAM CBLAT3
385385
IF( TRACE )
386386
$ CLOSE ( NTRA )
387387
CLOSE ( NOUT )
388-
STOP
388+
IF( FATAL ) THEN
389+
CALL ABORT
390+
END IF
389391
*
390392
10002 FORMAT( ' COLUMN-MAJOR AND ROW-MAJOR DATA LAYOUTS ARE TESTED' )
391393
10001 FORMAT(' ROW-MAJOR DATA LAYOUT IS TESTED' )

‎ctest/c_dblat1.f‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ PROGRAM DCBLAT1
4444
CALL CHECK3(SFAC)
4545
END IF
4646
* -- Print
47-
IF (PASS) WRITE (NOUT,99998)
47+
IF (PASS) THEN
48+
WRITE (NOUT,99998)
49+
ELSE
50+
CALL ABORT
51+
END IF
4852
20 CONTINUE
49-
STOP
5053
*
5154
99999 FORMAT (' Real CBLAS Test Program Results',/1X)
5255
99998 FORMAT (' ----- PASS -----')
@@ -136,7 +139,7 @@ SUBROUTINE CHECK0(SFAC)
136139
CALL STEST1(SS,DS1(K),DS1(K),SFAC)
137140
ELSE
138141
WRITE (NOUT,*) ' Shouldn''t be here in CHECK0'
139-
STOP
142+
CALL ABORT
140143
END IF
141144
20 CONTINUE
142145
40 RETURN
@@ -229,7 +232,7 @@ SUBROUTINE CHECK1(SFAC)
229232
CALL ITEST1(IDAMAXTEST(N,SX,INCX),ITRUE2(NP1))
230233
ELSE
231234
WRITE (NOUT,*) ' Shouldn''t be here in CHECK1'
232-
STOP
235+
CALL ABORT
233236
END IF
234237
60 CONTINUE
235238
80 CONTINUE
@@ -384,7 +387,7 @@ SUBROUTINE CHECK2(SFAC)
384387
CALL STEST(LENY,SY,STY,SSIZE2(1,1),1.0D0)
385388
ELSE
386389
WRITE (NOUT,*) ' Shouldn''t be here in CHECK2'
387-
STOP
390+
CALL ABORT
388391
END IF
389392
100 CONTINUE
390393
120 CONTINUE
@@ -472,7 +475,7 @@ SUBROUTINE CHECK3(SFAC)
472475
70 CONTINUE
473476
ELSE
474477
WRITE (NOUT,*) ' Shouldn''t be here in CHECK3'
475-
STOP
478+
CALL ABORT
476479
END IF
477480
40 CONTINUE
478481
60 CONTINUE

‎ctest/c_dblat2.f‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PROGRAM DBLAT2
1010
* 'DBLAT2.SNAP' NAME OF SNAPSHOT OUTPUT FILE
1111
* -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0)
1212
* F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD.
13-
* F LOGICAL FLAG, T TO STOP ON FAILURES.
13+
* F LOGICAL FLAG, T TO CALL ABORT ON FAILURES.
1414
* T LOGICAL FLAG, T TO TEST ERROR EXITS.
1515
* 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH
1616
* 16.0 THRESHOLD VALUE OF TEST RATIO
@@ -239,7 +239,7 @@ PROGRAM DBLAT2
239239
$ GO TO 70
240240
60 CONTINUE
241241
WRITE( NOUT, FMT = 9986 )SNAMET
242-
STOP
242+
CALL ABORT
243243
70 LTEST( I ) = LTESTT
244244
GO TO 50
245245
*
@@ -279,15 +279,15 @@ PROGRAM DBLAT2
279279
SAME = LDE( YY, YT, N )
280280
IF( .NOT.SAME.OR.ERR.NE.ZERO )THEN
281281
WRITE( NOUT, FMT = 9985 )TRANS, SAME, ERR
282-
STOP
282+
CALL ABORT
283283
END IF
284284
TRANS = 'T'
285285
CALL DMVCH( TRANS, N, N, ONE, A, NMAX, X, -1, ZERO, Y, -1, YT, G,
286286
$ YY, EPS, ERR, FATAL, NOUT, .TRUE. )
287287
SAME = LDE( YY, YT, N )
288288
IF( .NOT.SAME.OR.ERR.NE.ZERO )THEN
289289
WRITE( NOUT, FMT = 9985 )TRANS, SAME, ERR
290-
STOP
290+
CALL ABORT
291291
END IF
292292
*
293293
* Test each subroutine in turn.
@@ -414,7 +414,9 @@ PROGRAM DBLAT2
414414
IF( TRACE )
415415
$ CLOSE ( NTRA )
416416
CLOSE ( NOUT )
417-
STOP
417+
IF( FATAL ) THEN
418+
CALL ABORT
419+
END IF
418420
*
419421
10002 FORMAT( ' COLUMN-MAJOR AND ROW-MAJOR DATA LAYOUTS ARE TESTED' )
420422
10001 FORMAT( ' ROW-MAJOR DATA LAYOUT IS TESTED' )

‎ctest/c_dblat3.f‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PROGRAM DBLAT3
1010
* 'DBLAT3.SNAP' NAME OF SNAPSHOT OUTPUT FILE
1111
* -1 UNIT NUMBER OF SNAPSHOT FILE (NOT USED IF .LT. 0)
1212
* F LOGICAL FLAG, T TO REWIND SNAPSHOT FILE AFTER EACH RECORD.
13-
* F LOGICAL FLAG, T TO STOP ON FAILURES.
13+
* F LOGICAL FLAG, T TO CALL ABORT ON FAILURES.
1414
* T LOGICAL FLAG, T TO TEST ERROR EXITS.
1515
* 2 0 TO TEST COLUMN-MAJOR, 1 TO TEST ROW-MAJOR, 2 TO TEST BOTH
1616
* 16.0 THRESHOLD VALUE OF TEST RATIO
@@ -189,7 +189,7 @@ PROGRAM DBLAT3
189189
$ GO TO 50
190190
40 CONTINUE
191191
WRITE( NOUT, FMT = 9990 )SNAMET
192-
STOP
192+
CALL ABORT
193193
50 LTEST( I ) = LTESTT
194194
GO TO 30
195195
*
@@ -232,7 +232,7 @@ PROGRAM DBLAT3
232232
SAME = LDE( CC, CT, N )
233233
IF( .NOT.SAME.OR.ERR.NE.ZERO )THEN
234234
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
235-
STOP
235+
CALL ABORT
236236
END IF
237237
TRANSB = 'T'
238238
CALL DMMCH( TRANSA, TRANSB, N, 1, N, ONE, AB, NMAX,
@@ -241,7 +241,7 @@ PROGRAM DBLAT3
241241
SAME = LDE( CC, CT, N )
242242
IF( .NOT.SAME.OR.ERR.NE.ZERO )THEN
243243
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
244-
STOP
244+
CALL ABORT
245245
END IF
246246
DO 120 J = 1, N
247247
AB( J, NMAX + 1 ) = N - J + 1
@@ -259,7 +259,7 @@ PROGRAM DBLAT3
259259
SAME = LDE( CC, CT, N )
260260
IF( .NOT.SAME.OR.ERR.NE.ZERO )THEN
261261
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
262-
STOP
262+
CALL ABORT
263263
END IF
264264
TRANSB = 'T'
265265
CALL DMMCH( TRANSA, TRANSB, N, 1, N, ONE, AB, NMAX,
@@ -268,7 +268,7 @@ PROGRAM DBLAT3
268268
SAME = LDE( CC, CT, N )
269269
IF( .NOT.SAME.OR.ERR.NE.ZERO )THEN
270270
WRITE( NOUT, FMT = 9989 )TRANSA, TRANSB, SAME, ERR
271-
STOP
271+
CALL ABORT
272272
END IF
273273
*
274274
* Test each subroutine in turn.
@@ -379,7 +379,9 @@ PROGRAM DBLAT3
379379
IF( TRACE )
380380
$ CLOSE ( NTRA )
381381
CLOSE ( NOUT )
382-
STOP
382+
IF( FATAL ) THEN
383+
CALL ABORT
384+
END IF
383385
*
384386
10002 FORMAT( ' COLUMN-MAJOR AND ROW-MAJOR DATA LAYOUTS ARE TESTED' )
385387
10001 FORMAT( ' ROW-MAJOR DATA LAYOUT IS TESTED' )

0 commit comments

Comments
 (0)