Skip to content

Commit 611a9f4

Browse files
Chris BlantonChris Blanton
authored andcommitted
Set environment variables to allow split-vars tests to find the script and exec
1 parent b4b3c92 commit 611a9f4

File tree

7 files changed

+29
-1
lines changed

7 files changed

+29
-1
lines changed

tests/split_ncvars/split_ncvars

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ fi
2626

2727
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

29+
# Set paths to list-vars script and just-compiled exec
30+
export LIST_NCVARS=`find ../.. -name list_ncvars.sh`
31+
export PKGLIBEXECDIR=$(dirname $LIST_NCVARS)
32+
2933
# Use the test netCDF files from plevel and timeavg
3034
${builddir=.}/create_timeavg_test_ncfiles || framework_failure_ "failed to create timeavg test files"
3135
${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create plevel test files"
@@ -43,4 +47,4 @@ split_ncvars.pl test_input_*.nc || fail_ split_ncvars.pl multiple input files fa
4347
test -f var1.nc || fail_ var1.nc not created with multiple input files
4448
test -f var2.nc || fail_ var2.nc not created with multiple input files
4549
# Verify there are 60 time steps
46-
ncdump -h var1.nc | grep -q '60 currently' || fail_ var1.nc does not have 60 time steps
50+
ncdump -h var1.nc | grep -q '60 currently' || fail_ var1.nc does not have 60 time steps

tests/split_ncvars/split_ncvars-i

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ fi
2626

2727
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

29+
# Set paths to list-vars script and just-compiled exec
30+
export LIST_NCVARS=`find ../.. -name list_ncvars.sh`
31+
export PKGLIBEXECDIR=$(dirname $LIST_NCVARS)
32+
2933
# Use the test netCDF files from plevel
3034
${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create plevel test files"
3135
mkdir idir || framework_failure_ "failed to create idir"

tests/split_ncvars/split_ncvars-l

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ fi
2626

2727
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

29+
# Set paths to list-vars script and just-compiled exec
30+
export LIST_NCVARS=`find ../.. -name list_ncvars.sh`
31+
export PKGLIBEXECDIR=$(dirname $LIST_NCVARS)
32+
2933
# Use the test netCDF files from timeavg
3034
${builddir=.}/create_timeavg_test_ncfiles || framework_failure_ "failed to create test files"
3135

tests/split_ncvars/split_ncvars-o

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ fi
2626

2727
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

29+
# Set paths to list-vars script and just-compiled exec
30+
export LIST_NCVARS=`find ../.. -name list_ncvars.sh`
31+
export PKGLIBEXECDIR=$(dirname $LIST_NCVARS)
32+
2933
# Use the test netCDF files from plevel
3034
${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create plevel test files"
3135

tests/split_ncvars/split_ncvars-p

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ fi
2626

2727
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

29+
# Set paths to list-vars script and just-compiled exec
30+
export LIST_NCVARS=`find ../.. -name list_ncvars.sh`
31+
export PKGLIBEXECDIR=$(dirname $LIST_NCVARS)
32+
2933
# Use the test netCDF files from plevel
3034
${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create test files"
3135

tests/split_ncvars/split_ncvars-s

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ fi
2626

2727
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

29+
# Set paths to list-vars script and just-compiled exec
30+
export LIST_NCVARS=`find ../.. -name list_ncvars.sh`
31+
export PKGLIBEXECDIR=$(dirname $LIST_NCVARS)
32+
2933
# Use the test netCDF files from plevel
3034
${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create plevel test files"
3135

tests/split_ncvars/split_ncvars-v

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ fi
2626

2727
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

29+
# Set paths to list-vars script and just-compiled exec
30+
export LIST_NCVARS=`find ../.. -name list_ncvars.sh`
31+
export PKGLIBEXECDIR=$(dirname $LIST_NCVARS)
32+
2933
# Use the test netCDF files from plevel
3034
${builddir=.}/create_plevel_test_ncfile || framework_failure_ "failed to create test files"
3135

0 commit comments

Comments
 (0)