Use '@top_builddir@' instead of '@abs_top_builddir@' and '..' in the test scripts.

tests/pio_write_deco2d_run.in

@@ -6,12 +6,12 @@ mpi_task_num="${mpi_task_num-6}"
 suffix="${suffix-grb}"
 
 exec 5>&1 6>&2 >"$LOG" 2>&1
-../libtool --mode=execute @MPI_LAUNCH@ -n ${mpi_task_num} \
+@top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n ${mpi_task_num} \
   ${tool_wrap_mpi} ./pio_write_deco2d ${pio_write_args} || exit 1
 exec 2>&6 1>&5 5>&- 6>&-
-../libtool --mode=execute \
+@top_builddir@/libtool --mode=execute \
   ${tool_wrap} ./cksum_read example_0.${suffix} example_0.cksum || exit 1
-../libtool --mode=execute \
+@top_builddir@/libtool --mode=execute \
   ${tool_wrap} ./cksum_read example_1.${suffix} example_1.cksum || exit 1
 #
 # Local Variables:

tests/pio_write_run.in

@@ -12,15 +12,15 @@ test_variation()
   exec 5>&1 6>&2 >"$LOG" 2>&1
   echo "creating data with $1" >&2
   variation=$1
-  ../libtool --mode=execute \
+  @top_builddir@/libtool --mode=execute \
     @MPI_LAUNCH@ \
     -n ${mpi_task_num} ${tool_wrap_mpi} \
     ./pio_write ${pio_write_args} -s 7 ${variation} || exit 1
   echo "checking example_0.$suffix" >&2
-  ../libtool --mode=execute \
+  @top_builddir@/libtool --mode=execute \
     ${tool_wrap} ./cksum_read example_0.${suffix} example_0.cksum || exit 1
   echo "checking example_1.$suffix" >&2
-  ../libtool --mode=execute \
+  @top_builddir@/libtool --mode=execute \
     ${tool_wrap} ./cksum_read example_1.${suffix} example_1.cksum || exit 1
 }
 

tests/test_byteswap_run.in

 #!@SHELL@
 
-../libtool --mode=execute ${tool_wrap} ./test_byteswap || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} ./test_byteswap || exit 1
 #
 # Local Variables:
 # mode: sh

tests/test_cdf_const.in

@@ -6,9 +6,9 @@ cdi_app_stderr="$0.cdi_app.stderr"
 
 exec >test_cdf_const.log 2>&1
 
-../libtool --mode=execute ${tool_wrap} @abs_top_builddir@/examples/cdi_write_const || exit 1
-../libtool --mode=execute ${tool_wrap} @abs_top_builddir@/app/cdi -s example_const.nc >${cdi_app_stdout} 2>${cdi_app_stderr} || exit 1
-../libtool --mode=execute ${tool_wrap} @abs_top_builddir@/app/cdi example_const.nc >>${cdi_app_stdout} 2>>${cdi_app_stderr} || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} @top_builddir@/examples/cdi_write_const || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} @top_builddir@/app/cdi -s example_const.nc >${cdi_app_stdout} 2>${cdi_app_stderr} || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} @top_builddir@/app/cdi example_const.nc >>${cdi_app_stdout} 2>>${cdi_app_stderr} || exit 1
 
 echo "$0"
 exec 6<${cdi_app_stdout} 7<"$0"
@@ -25,7 +25,7 @@ while read line <&6 ; do
 done
 
 if test -s ${cdi_app_stderr}; then
-  echo "unexpected error message from @abs_top_builddir@/app/cdi:"
+  echo "unexpected error message from @top_builddir@/app/cdi:"
   cat ${cdi_app_stderr}
   exit 1
 fi

tests/test_cdf_transformation.in

@@ -3,9 +3,9 @@ test 'x@ENABLE_NETCDF@' = xyes || exit 77
 
 ncdatafile="$0.nc"
 
-../libtool --mode=execute ${tool_wrap} ./test_cdf_write "${ncdatafile}" || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} ./test_cdf_write "${ncdatafile}" || exit 1
 
-digest=`../libtool --mode=execute ${tool_wrap} ./test_cdf_read "${ncdatafile}"` || exit 1
+digest=`@top_builddir@/libtool --mode=execute ${tool_wrap} ./test_cdf_read "${ncdatafile}"` || exit 1
 missValueCount=`echo "$digest" | @SED@ -n '/^missing values count =/{
 s/^missing values count *= *//
 p

tests/test_chunk_cksum.in

@@ -3,5 +3,5 @@ test 'x@ENABLE_NETCDF@' = xyes || exit 77
 
 format=nc
 exec >test_chunk_cksum_$format.log 2>&1
-../libtool --mode=execute ${tool_wrap} ./cksum_write_chunk -m 17 || exit 1
-../libtool --mode=execute ${tool_wrap} ./cksum_read example.$format || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} ./cksum_write_chunk -m 17 || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} ./cksum_read example.$format || exit 1

tests/test_f2003.in

@@ -7,8 +7,8 @@ cdi_read_f2003_stderr="$0.cdi_read_f2003.stderr"
 
 format=nc
 exec >test_f2003_$format.log 2>&1
-../libtool --mode=execute ${tool_wrap} @abs_top_builddir@/examples/cdi_write_f2003 || exit 1
-../libtool --mode=execute ${tool_wrap} @abs_top_builddir@/examples/cdi_read_f2003 >${cdi_read_f2003_stdout} 2>${cdi_read_f2003_stderr} || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} @top_builddir@/examples/cdi_write_f2003 || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} @top_builddir@/examples/cdi_read_f2003 >${cdi_read_f2003_stdout} 2>${cdi_read_f2003_stderr} || exit 1
 
 echo "$0"
 exec 5<${cdi_read_f2003_stdout} 6<${cdi_read_f2003_stderr} 7<"$0"

tests/test_resource_copy_mpi_run.in

@@ -2,5 +2,5 @@
 test 'x@MPI_LAUNCH@' != xtrue || exit 77
 
 mpi_task_num="${mpi_task_num-1}"
-../libtool --mode=execute @MPI_LAUNCH@ -n ${mpi_task_num} \
+@top_builddir@/libtool --mode=execute @MPI_LAUNCH@ -n ${mpi_task_num} \
   ./test_resource_copy_mpi || exit 1

tests/test_resource_copy_run.in

 #!@SHELL@
 
-../libtool --mode=execute ${tool_wrap} ./test_resource_copy || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} ./test_resource_copy || exit 1
 #
 # Local Variables:
 # mode: sh

tests/test_table_run.in

 #!@SHELL@
 
-../libtool --mode=execute ${tool_wrap} ./test_table || exit 1
+@top_builddir@/libtool --mode=execute ${tool_wrap} ./test_table || exit 1
 #
 # Local Variables:
 # mode: sh