Skip to content

Commit bb4c18a

Browse files
shahramnshahramn
committed
Testing: Cleanup
1 parent ec97767 commit bb4c18a

File tree

5 files changed

+34
-33
lines changed

5 files changed

+34
-33
lines changed

‎tests/grib_change_packing.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
#!/bin/sh
22

3-
# --- check nothing bombs when changing packing
4-
# --- for now limited to just a few packing schemes
3+
# (C) Copyright 2005- ECMWF.
4+
#
5+
# This software is licensed under the terms of the Apache Licence Version 2.0
6+
# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
7+
#
8+
# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
9+
# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
10+
#
11+
12+
# Check nothing bombs when changing packing
513

614
. ./include.ctest.sh
715

‎tests/grib_cmp_paramtype.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,7 @@
1010

1111
. ./include.ctest.sh
1212

13-
# ---------------------------------------------------------
14-
# This is the test for the JIRA issue ECC-XXXX
15-
# < Add issue summary here >
16-
# ---------------------------------------------------------
17-
18-
REDIRECT=/dev/null
19-
20-
label="grib_cmp_paramtype_test" # Change prod to bufr or grib etc
13+
label="grib_cmp_paramtype_test"
2114
tempGrib=temp.$label.grib
2215
tempFilt=temp.$label.filt
2316

‎tests/grib_ecc-2005.cc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
/*
2+
* (C) Copyright 2005- ECMWF.
3+
*
4+
* This software is licensed under the terms of the Apache Licence Version 2.0
5+
* which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
6+
*
7+
* In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
8+
* virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
9+
*/
10+
111
#include <stdlib.h>
212
#include <stdio.h>
313
#include <string.h>

‎tests/grib_paramtypeConcept.sh

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@
1010

1111
. ./include.ctest.sh
1212

13-
# ---------------------------------------------------------
14-
# This is the test for the JIRA issue ECC-XXXX
15-
# < Add issue summary here >
16-
# ---------------------------------------------------------
17-
18-
REDIRECT=/dev/null
19-
20-
label="grib_paramtypeconcept_all_pdtn" # Change prod to bufr or grib etc
13+
label="grib_paramtypeconcept_test"
2114
tempGrib=temp.$label.grib
22-
tempText=temp.$label.txt
23-
rm -f $tempGrib $tempText
15+
16+
if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
17+
echo "$0: This test is currently disabled on Windows"
18+
exit 0
19+
fi
2420

2521
sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
2622
latestOfficial=$( ${tools_dir}/grib_get -p tablesVersionLatestOfficial $sample_grib2 )
@@ -30,7 +26,6 @@ if [ -f "$latest_codetable_file" ]; then
3026
for pdtn in $pdtns; do
3127
# echo "Doing $pdtn "
3228
${tools_dir}/grib_set -s tablesVersion=$latestOfficial,productDefinitionTemplateNumber=$pdtn $sample_grib2 $tempGrib
33-
${tools_dir}/grib_get -p paramtype $tempGrib
3429
paramtype=$( ${tools_dir}/grib_get -p paramtype $tempGrib )
3530
if [[ $paramtype == 'unknown' ]]; then
3631
echo "productDefinitionTemplateNumber=$pdtn: paramtype not defined"
@@ -40,4 +35,4 @@ if [ -f "$latest_codetable_file" ]; then
4035
fi
4136

4237
# Clean up
43-
rm -f $tempGrib $tempText
38+
rm -f $tempGrib

‎tests/grib_timeSpanConcept.sh

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,14 @@
1010

1111
. ./include.ctest.sh
1212

13-
# ---------------------------------------------------------
14-
# This is the test for the JIRA issue ECC-XXXX
15-
# < Add issue summary here >
16-
# ---------------------------------------------------------
17-
18-
REDIRECT=/dev/null
19-
2013
label="grib_timespan_concept_test"
2114
tempGrib=temp.$label.grib
22-
tempText=temp.$label.txt
2315
tempFilt=temp.$label.filt
24-
rm -f $tempGrib $tempText $tempFilt
16+
17+
if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
18+
echo "$0: This test is currently disabled on Windows"
19+
exit 0
20+
fi
2521

2622
sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
2723
latestOfficial=$( ${tools_dir}/grib_get -p tablesVersionLatestOfficial $sample_grib2 )
@@ -41,7 +37,6 @@ if (defined(lengthOfTimeRange)){
4137
write;
4238
EOF
4339
${tools_dir}/grib_filter -o $tempGrib $tempFilt $sample_grib2
44-
${tools_dir}/grib_get -p timeSpan $tempGrib
4540
timeSpan=$( ${tools_dir}/grib_get -p timeSpan $tempGrib )
4641
if [[ $timeSpan == 'unknown' ]]; then
4742
echo "productDefinitionTemplateNumber=$pdtn: timeSpan not defined"
@@ -51,4 +46,4 @@ EOF
5146
fi
5247

5348
# Clean up
54-
rm -f $tempGrib $tempText
49+
rm -f $tempGrib

0 commit comments

Comments
 (0)