Make test file name prefix configurable.

tests/pio_write.c

@@ -31,11 +31,22 @@
 #include "pio_util.h"
 #endif
 
+static const char default_fname_prefix[] = "example";
+
 static const struct model_config default_setup
 #ifdef __cplusplus
-    = {
-        12, 6, 3, 5, 5, CDI_FILETYPE_GRB, CDI_DATATYPE_PACK24, PIO_WRITE_CONFIG_CHECKSUM_FLAG, TAXIS_ABSOLUTE, -1, "example", "grb"
-      };
+    = { 12,
+        6,
+        3,
+        5,
+        5,
+        CDI_FILETYPE_GRB,
+        CDI_DATATYPE_PACK24,
+        PIO_WRITE_CONFIG_CHECKSUM_FLAG,
+        TAXIS_ABSOLUTE,
+        -1,
+        "grb",
+        default_fname_prefix };
 #else
     = {
         .nlon = 12,
@@ -48,8 +59,8 @@ static const struct model_config default_setup
         .flags = PIO_WRITE_CONFIG_CHECKSUM_FLAG,
         .taxistype = TAXIS_ABSOLUTE,
         .taxisunit = -1,
-        .prefix = "example",
         .suffix = "grb",
+        .prefix = default_fname_prefix,
       };
 #endif
 
@@ -190,7 +201,7 @@ parse_long_option(struct model_config *restrict setup, int pioConfHandle, pioRol
                     curvilinearGridOptionStr[] = "no-create-curvilinear-grid", uuidCreateOptionStr[] = "no-create-uuid",
                     useDistGridOptionStr[] = "no-use-dist-grid", batchedRmaOptionStr[] = "no-batch-rma",
                     presetDecoOptionStr[] = "no-preset-decomposition", datatypeOptionStr[] = "datatype",
-                    taxistypeOptionStr[] = "taxis-type", taxisunitOptionStr[] = "taxis-unit";
+                    prefixOptionStr[] = "prefix", taxistypeOptionStr[] = "taxis-type", taxisunitOptionStr[] = "taxis-unit";
   static const struct string2int datatypeArgMap[] = {
     { "pack", CDI_DATATYPE_PACK },     { "pack1", CDI_DATATYPE_PACK1 },   { "pack2", CDI_DATATYPE_PACK2 },
     { "pack3", CDI_DATATYPE_PACK3 },   { "pack4", CDI_DATATYPE_PACK4 },   { "pack5", CDI_DATATYPE_PACK5 },
@@ -268,6 +279,15 @@ parse_long_option(struct model_config *restrict setup, int pioConfHandle, pioRol
                        pioRoleSchemeOptionStr);
 #endif
     }
+  else if (!strncmp(str, prefixOptionStr, sizeof(prefixOptionStr) - 1))
+    {
+      if (str[sizeof(prefixOptionStr) - 1] == '=')
+        {
+          setup->prefix = str + sizeof(prefixOptionStr);
+        }
+      else
+        invalidOptionDie("long option %s needs argument\n", prefixOptionStr);
+    }
   else if ((bop = parseBooleanLongOption(sizeof(useDistGridOptionStr), useDistGridOptionStr, str)).matched)
     {
 #if defined USE_MPI && defined HAVE_PPM_DIST_ARRAY_H
@@ -359,7 +379,7 @@ int main(int argc, char *argv[])
   {
     int opt;
     while ((opt = getopt(argc, argv,
-                         "b:f:m:n:z:t:y:cs:q:"
+                         "f:m:n:z:t:y:cs:q:"
 #ifdef USE_MPI
                          "p:w:"
 #endif
@@ -388,7 +408,6 @@ int main(int argc, char *argv[])
         break;
 #endif
       case 'q': parse_long_option(&setup, pioConfHandle, &pioRoleAssign, optarg, argc, argv); break;
-      case 'b': setup.prefix = optarg; break;
       case 'f':
         {
           int found = 0;

tests/pio_write.h

@@ -33,8 +33,7 @@ struct model_config
   int filetype, datatype;
   int flags;
   int taxistype, taxisunit;
-  const char *prefix;
-  const char *suffix;
+  const char *suffix, *prefix;
 };
 
 void modelRun(const struct model_config *setup, MPI_Comm comm);

tests/pio_write_deco2d_run_parallel.test.in

@@ -28,11 +28,11 @@ case ${suffix} in
 esac
 
 @top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n ${mpi_task_num} \
-  ${tool_wrap_mpi} ./pio_write_deco2d_parallel -b ${prefix} -f ${suffix} ${pio_write_args} || exit 1
+  ${tool_wrap_mpi} ./pio_write_deco2d_parallel "-qprefix=${prefix}" -f ${suffix} ${pio_write_args} || exit 1
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read ${prefix}_0.${suffix} ${prefix}_0.cksum || exit 1
+  ${tool_wrap} ./cksum_read "${prefix}_0.${suffix}" "${prefix}_0.cksum" || exit 1
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read ${prefix}_1.${suffix} ${prefix}_1.cksum || exit 1
+  ${tool_wrap} ./cksum_read "${prefix}_1.${suffix}" "${prefix}_1.cksum" || exit 1
 #
 # Local Variables:
 # mode: sh

tests/pio_write_deco2d_run_serial.in

@@ -23,11 +23,11 @@ case ${suffix} in
 esac
 
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./pio_write_deco2d_serial -b ${prefix} -f ${suffix} ${pio_write_args} || exit 1
+  ${tool_wrap} ./pio_write_deco2d_serial "-qprefix=${prefix}" -f ${suffix} ${pio_write_args} || exit 1
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read ${prefix}_0.${suffix} ${prefix}_0.cksum || exit 1
+  ${tool_wrap} ./cksum_read "${prefix}_0.${suffix}" "${prefix}_0.cksum" || exit 1
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read ${prefix}_1.${suffix} ${prefix}_1.cksum || exit 1
+  ${tool_wrap} ./cksum_read "${prefix}_1.${suffix}" "${prefix}_1.cksum" || exit 1
 #
 # Local Variables:
 # mode: sh

tests/pio_write_dist_array.test.in

@@ -34,13 +34,14 @@ variation='-qcreate-curvilinear-grid -quse-dist-grid'
 echo "creating data with ${variation}" >&2
 @top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ \
-  -n ${mpi_task_num} ${tool_wrap} ./pio_write_parallel -b ${prefix} -f ${suffix} ${pio_write_args} -s 7 ${variation} || exit 1
+  -n ${mpi_task_num} ${tool_wrap} ./pio_write_parallel "-qprefix=${prefix}" -f ${suffix} \
+  ${pio_write_args} -s 7 ${variation} || exit 1
 echo "checking ${prefix}_0.${suffix}" >&2
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read ${prefix}_0.${suffix} ${prefix}_0.cksum || exit 1
+  ${tool_wrap} ./cksum_read "${prefix}_0.${suffix}" "${prefix}_0.cksum" || exit 1
 echo "checking ${prefix}_1.${suffix}" >&2
 @top_builddir@/libtool --mode=execute \
-  ${tool_wrap} ./cksum_read ${prefix}_1.${suffix} ${prefix}_1.cksum || exit 1
+  ${tool_wrap} ./cksum_read "${prefix}_1.${suffix}" "${prefix}_1.cksum" || exit 1
 
 #
 # Local Variables:

tests/pio_write_run_parallel.test.in

@@ -36,13 +36,13 @@ test_variation()
   @top_builddir@/libtool --mode=execute \
     @MPI_LAUNCH@ \
     -n ${mpi_task_num} ${tool_wrap_mpi} \
-    ./pio_write_parallel -b ${prefix} -f ${suffix} ${pio_write_args} -s 7 ${variation} || exit 1
+    ./pio_write_parallel "-qprefix=${prefix}" -f ${suffix} ${pio_write_args} -s 7 ${variation} || exit 1
   echo "checking ${prefix}_0.${suffix}" >&2
   @top_builddir@/libtool --mode=execute \
-    ${tool_wrap} ./cksum_read ${prefix}_0.${suffix} ${prefix}_0.cksum || exit 1
+    ${tool_wrap} ./cksum_read "${prefix}_0.${suffix}" "${prefix}_0.cksum" || exit 1
   echo "checking ${prefix}_1.${suffix}" >&2
   @top_builddir@/libtool --mode=execute \
-    ${tool_wrap} ./cksum_read ${prefix}_1.${suffix} ${prefix}_1.cksum || exit 1
+    ${tool_wrap} ./cksum_read "${prefix}_1.${suffix}" "${prefix}_1.cksum" || exit 1
 }
 
 for variation in "" $variations ; do

tests/pio_write_run_serial.in

@@ -30,13 +30,13 @@ test_variation()
   echo "creating data with $1" >&2
   variation=$1
   @top_builddir@/libtool --mode=execute \
-    ${tool_wrap} ./pio_write_serial -b ${prefix} -f ${suffix} ${pio_write_args} -s 7 ${variation} || exit 1
+    ${tool_wrap} ./pio_write_serial "-qprefix=${prefix}" -f ${suffix} ${pio_write_args} -s 7 ${variation} || exit 1
   echo "checking ${prefix}_0.${suffix}" >&2
   @top_builddir@/libtool --mode=execute \
-    ${tool_wrap} ./cksum_read ${prefix}_0.${suffix} ${prefix}_0.cksum || exit 1
+    ${tool_wrap} ./cksum_read "${prefix}_0.${suffix}" "${prefix}_0.cksum" || exit 1
   echo "checking ${prefix}_1.${suffix}" >&2
   @top_builddir@/libtool --mode=execute \
-    ${tool_wrap} ./cksum_read ${prefix}_1.${suffix} ${prefix}_1.cksum || exit 1
+    ${tool_wrap} ./cksum_read "${prefix}_1.${suffix}" "${prefix}_1.cksum" || exit 1
 }
 
 for variation in "" $variations ; do