Skip to content
Snippets Groups Projects
Commit a91bb1f8 authored by Thomas Jahns's avatar Thomas Jahns :cartwheel: Committed by Sergey Kosukhin
Browse files

Make test file name prefix configurable.

parent be018561
No related branches found
No related tags found
1 merge request!14Draft: K202125/cdi 1.8.x pio merge followup
Hide whitespace changes
Inline Side-by-side
tests/pio_write.c
+ 17
− 6
View file @ a91bb1f8
......@@ -31,20 +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"};
"grb", default_fname_prefix };
#else
= { .nlon = 12, .nts = 3, .nlat = 6, .nvars = 5,
.filetype = CDI_FILETYPE_GRB, .datatype = CDI_DATATYPE_PACK24,
.flags = PIO_WRITE_CONFIG_CHECKSUM_FLAG,
.taxistype = TAXIS_ABSOLUTE,
.taxisunit = -1,
.prefix = "example",
.suffix = "grb",
.prefix = default_fname_prefix,
.max_nlev = 5,
};
#endif
......@@ -191,6 +193,7 @@ parse_long_option(struct model_config *restrict setup,
batchedRmaOptionStr[] = "no-batch-rma",
presetDecoOptionStr[] = "no-preset-decomposition",
datatypeOptionStr[] = "datatype",
prefixOptionStr[] = "prefix",
taxistypeOptionStr[] = "taxis-type",
taxisunitOptionStr[] = "taxis-unit";
static const struct string2int datatypeArgMap[]
......@@ -314,6 +317,17 @@ parse_long_option(struct model_config *restrict setup,
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)
{
......@@ -415,7 +429,7 @@ int main(int argc, char *argv[])
{
int opt;
while ((opt = getopt(argc, argv, "b:f:m:n:z:t:y:cs:q:"
while ((opt = getopt(argc, argv, "f:m:n:z:t:y:cs:q:"
#ifdef USE_MPI
"p:w:"
#endif
......@@ -446,9 +460,6 @@ int main(int argc, char *argv[])
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
+ 1
− 2
View file @ a91bb1f8
......@@ -35,8 +35,7 @@ struct model_config
int filetype, datatype;
int flags;
int taxistype, taxisunit;
const char *prefix;
const char *suffix;
const char *suffix, *prefix;
};
void
......
tests/pio_write_deco2d_run_parallel.test.in
+ 3
− 3
View file @ a91bb1f8
......@@ -28,11 +28,11 @@ case ${suffix} in
esac
@top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n ${mpi_task_num} \
${tool_wrap} ./pio_write_deco2d_parallel -b ${prefix} -f ${suffix} ${pio_write_args} || exit 1
${tool_wrap} ./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
+ 3
− 3
View file @ a91bb1f8
......@@ -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
+ 4
− 3
View file @ a91bb1f8
......@@ -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
+ 4
− 3
View file @ a91bb1f8
......@@ -35,13 +35,14 @@ test_variation()
variation=$1
@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
}
for variation in "" $variations ; do
......
tests/pio_write_run_serial.in
+ 3
− 3
View file @ a91bb1f8
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Imprint | Privacy Policy