From 280c5dd2421ecbbc913182d5b63b60ee62ef79ea Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Tue, 23 Nov 2021 09:34:00 +0100
Subject: [PATCH] Refactor the skipping conditions in the tests.
---
tests/pio_cksum_writer.test.in | 1 -
tests/test_cdf_const.in | 2 +-
tests/test_cdf_transformation.in | 2 +-
tests/test_cksum_nc.in | 2 +-
tests/test_cksum_nc_chunk.in | 2 +-
tests/test_f2003.in | 2 +-
6 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tests/pio_cksum_writer.test.in b/tests/pio_cksum_writer.test.in
index e2a8a065b..292c1240e 100644
--- a/tests/pio_cksum_writer.test.in
+++ b/tests/pio_cksum_writer.test.in
@@ -1,5 +1,4 @@
#!@SHELL@
-test 'x@ENABLE_GRIB@' = xyes || exit 77
pio_write_args="-p PIO_WRITER -w 4"
mpi_task_num=8
diff --git a/tests/test_cdf_const.in b/tests/test_cdf_const.in
index 51c3628d9..21a99f055 100644
--- a/tests/test_cdf_const.in
+++ b/tests/test_cdf_const.in
@@ -1,5 +1,5 @@
#!@SHELL@
-test 'x@ENABLE_NETCDF@' = xyes || exit 77
+@ENABLE_NETCDF_FALSE@exit 77
cdi_app_stdout="$0.cdi_app.stdout"
cdi_app_stderr="$0.cdi_app.stderr"
diff --git a/tests/test_cdf_transformation.in b/tests/test_cdf_transformation.in
index 04978e80a..8e89108b8 100644
--- a/tests/test_cdf_transformation.in
+++ b/tests/test_cdf_transformation.in
@@ -1,5 +1,5 @@
#!@SHELL@
-test 'x@ENABLE_NETCDF@' = xyes || exit 77
+@ENABLE_NETCDF_FALSE@exit 77
ncdatafile="$0.nc"
diff --git a/tests/test_cksum_nc.in b/tests/test_cksum_nc.in
index 59ed95d37..64fbb82e5 100644
--- a/tests/test_cksum_nc.in
+++ b/tests/test_cksum_nc.in
@@ -1,5 +1,5 @@
#!@SHELL@
-test 'x@ENABLE_NETCDF@' = xyes || exit 77
+@ENABLE_NETCDF_FALSE@exit 77
prefix=${0##*/}
format=nc
diff --git a/tests/test_cksum_nc_chunk.in b/tests/test_cksum_nc_chunk.in
index b69c96d4a..97f8b8b7a 100644
--- a/tests/test_cksum_nc_chunk.in
+++ b/tests/test_cksum_nc_chunk.in
@@ -1,5 +1,5 @@
#!@SHELL@
-test 'x@ENABLE_NETCDF@' = xyes || exit 77
+@ENABLE_NETCDF_FALSE@exit 77
prefix=${0##*/}
format=nc
diff --git a/tests/test_f2003.in b/tests/test_f2003.in
index ec6182ca1..c8b9f9f31 100644
--- a/tests/test_f2003.in
+++ b/tests/test_f2003.in
@@ -1,6 +1,6 @@
#!@SHELL@
@ENABLE_ISOC_INTERFACE_FALSE@exit 77
-test 'x@ENABLE_NETCDF@' = xyes || exit 77
+@ENABLE_NETCDF_FALSE@exit 77
cdi_read_f2003_stdout="$0.cdi_read_f2003.stdout"
cdi_read_f2003_stderr="$0.cdi_read_f2003.stderr"
--
GitLab