Skip to content

Commit 72be339

Browse files
committed
Trap DiffNum.pl output for CI and use O0 for test
Note that tee doesn't work here because the exit code returned will be from tee rather than DiffNum.pl. The usual workarounds seem to mostly require bash and the CI uses dash.
1 parent dec0c7c commit 72be339

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/ramscb-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: ram_test_tr
2929
run: |
3030
export PERL5LIB=$PERL5LIB:`pwd`
31-
./Config.pl -install -compiler=gfortran -mpi=openmpi -openmp -ncdf -gsl -O3
31+
./Config.pl -install -compiler=gfortran -mpi=openmpi -openmp -ncdf -gsl -O0
3232
make
3333
make testCI
3434
- name: unit_tests

Makefile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -239,27 +239,27 @@ test1_check:
239239
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
240240
${TESTDIR1}/output_ram/log_d20130317_t000000.log \
241241
${IMDIR}/output/test1/log.ref \
242-
> test1.diff
242+
> test1.diff || (cat test1.diff; exit 1;)
243243
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
244244
${TESTDIR1}/output_ram/pressure_d20130317_t001500.dat \
245245
${IMDIR}/output/test1/pressure.ref \
246-
>> test1.diff
246+
>> test1.diff || (cat test1.diff; exit 1;)
247247
ncdump -v "Flux_H","B_xyz" \
248248
${TESTDIR1}/output_ram/sat1_d20130317_t000000.nc \
249249
| sed -e '1,/data:/d' > \
250250
${TESTDIR1}/output_ram/sat1.test
251251
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
252252
${TESTDIR1}/output_ram/sat1.test \
253253
${IMDIR}/output/test1/sat1.ref \
254-
>> test1.diff
254+
>> test1.diff || (cat test1.diff; exit 1;)
255255
ncdump -v "Flux_H","B_xyz" \
256256
${TESTDIR1}/output_ram/sat2_d20130317_t000000.nc \
257257
| sed -e '1,/data:/d' > \
258258
${TESTDIR1}/output_ram/sat2.test
259259
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
260260
${TESTDIR1}/output_ram/sat2.test \
261261
${IMDIR}/output/test1/sat2.ref \
262-
>> test1.diff
262+
>> test1.diff || (cat test1.diff; exit 1;)
263263
@echo "Test Successful!"
264264

265265
#TEST 2----------------------------------
@@ -296,7 +296,7 @@ test2_check:
296296
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
297297
${TESTDIR2}/output_ram/pressure_d20130317_t001500.dat \
298298
${IMDIR}/output/test1/pressure.ref \
299-
> test2.diff
299+
> test2.diff || (cat test2.diff; exit 1;)
300300
ncrcat ${TESTDIR2}/output_ram/sat1_d20130317_t000000.nc \
301301
${TESTDIR2}/output_ram/sat1_d20130317_t001000.nc \
302302
${TESTDIR2}/output_ram/sat1.nc
@@ -306,7 +306,7 @@ test2_check:
306306
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
307307
${TESTDIR2}/output_ram/sat1.test \
308308
${IMDIR}/output/test1/sat1.ref \
309-
>> test2.diff
309+
>> test2.diff || (cat test2.diff; exit 1;)
310310
ncrcat ${TESTDIR2}/output_ram/sat2_d20130317_t000000.nc \
311311
${TESTDIR2}/output_ram/sat2_d20130317_t001000.nc \
312312
${TESTDIR2}/output_ram/sat2.nc
@@ -316,7 +316,7 @@ test2_check:
316316
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
317317
${TESTDIR2}/output_ram/sat2.test \
318318
${IMDIR}/output/test1/sat2.ref \
319-
>> test2.diff
319+
>> test2.diff || (cat test2.diff; exit 1;)
320320
@echo "Test Successful!"
321321

322322
#TEST 3----------------------------------
@@ -347,11 +347,11 @@ test3_check:
347347
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
348348
${TESTDIR3}/output_ram/pressure_d20130317_t001500.dat \
349349
${IMDIR}/output/test3/pressure.ref \
350-
> test3.diff
350+
> test3.diff || (cat test3.diff; exit 1;)
351351
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
352352
${TESTDIR3}/output_scb/hI_output_d20130317_t001500.dat \
353353
${IMDIR}/output/test3/hI.ref \
354-
>> test3.diff
354+
>> test3.diff || (cat test3.diff; exit 1;)
355355
@echo "Test Successful!"
356356

357357
#TEST 4----------------------------------
@@ -388,11 +388,11 @@ test4_check:
388388
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
389389
${TESTDIR4}/output_ram/pressure_d20130317_t001500.dat \
390390
${IMDIR}/output/test3/pressure.ref \
391-
> test4.diff
391+
> test4.diff || (cat test4.diff; exit 1;)
392392
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
393393
${TESTDIR4}/output_scb/hI_output_d20130317_t001500.dat \
394394
${IMDIR}/output/test3/hI.ref \
395-
>> test4.diff
395+
>> test4.diff || (cat test4.diff; exit 1;)
396396
ncrcat ${TESTDIR4}/output_ram/sat1_d20130317_t000000.nc \
397397
${TESTDIR4}/output_ram/sat1_d20130317_t001000.nc \
398398
${TESTDIR4}/output_ram/sat1.nc
@@ -402,7 +402,7 @@ test4_check:
402402
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
403403
${TESTDIR4}/output_ram/sat1.test \
404404
${IMDIR}/output/test3/sat1.ref \
405-
>> test4.diff
405+
>> test4.diff || (cat test4.diff; exit 1;)
406406
ncrcat ${TESTDIR4}/output_ram/sat2_d20130317_t000000.nc \
407407
${TESTDIR4}/output_ram/sat2_d20130317_t001000.nc \
408408
${TESTDIR4}/output_ram/sat2.nc
@@ -412,7 +412,7 @@ test4_check:
412412
${SCRIPTDIR}/DiffNum.pl -b -a=1e-9 \
413413
${TESTDIR4}/output_ram/sat2.test \
414414
${IMDIR}/output/test3/sat2.ref \
415-
>> test4.diff
415+
>> test4.diff || (cat test4.diff; exit 1;)
416416
@echo "Test Successful!"
417417

418418
#TEST EMIC----------------------------------

0 commit comments

Comments
 (0)