From 1b318a01fbc3c20e423fcfb4fd72149558c95a6e Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Thu, 16 Aug 2018 10:55:11 -0600 Subject: [PATCH] getting automake build working --- configure.ac | 3 +-- nc_test4/CMakeLists.txt | 2 +- nc_test4/Makefile.am | 5 ++--- nc_test4/run_par_test.sh.in | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 285d099cf..efb2ac62a 100644 --- a/configure.ac +++ b/configure.ac @@ -1550,8 +1550,7 @@ AC_CONFIG_FILES([Makefile dap4_test/Makefile plugins/Makefile ], - [test -f nc-config && chmod 755 nc-config]) - + [test -f nc_test4/run_par_test.sh && chmod ugo+x nc_test4/run_par_test.sh && test -f nc-config && chmod 755 nc-config]) AC_OUTPUT() #mv -f ${abs_top_srcdir}/test_common.sh ${abs_top_builddir}/test_common.sh diff --git a/nc_test4/CMakeLists.txt b/nc_test4/CMakeLists.txt index 6d2d6b91e..e1a09fa8d 100644 --- a/nc_test4/CMakeLists.txt +++ b/nc_test4/CMakeLists.txt @@ -101,4 +101,4 @@ IF(ENABLE_METADATA_PERF) add_sh_test(nc_test4 perftest) ENDIF() -ADD_EXTRA_DIST(findplugin.in) +ADD_EXTRA_DIST(findplugin.in run_par_test.sh.in) diff --git a/nc_test4/Makefile.am b/nc_test4/Makefile.am index f84260d93..e84763a0a 100644 --- a/nc_test4/Makefile.am +++ b/nc_test4/Makefile.am @@ -124,7 +124,7 @@ check_PROGRAMS += bigmeta openbigmeta tst_attsperf TESTS += tst_attsperf perftest.sh endif -EXTRA_DIST = run_par_test.sh run_bm.sh run_bm_test1.sh \ +EXTRA_DIST = run_par_test.sh.in run_bm.sh run_bm_test1.sh \ run_bm_test2.sh run_bm_radar_2D.sh run_bm_radar_2D_compression1.sh \ run_par_bm_test.sh run_bm_elena.sh run_par_bm_radar_2D.sh \ run_bm_radar_2D_endianness1.sh run_tst_chunks.sh ref_chunks1.cdl \ @@ -138,7 +138,6 @@ ref_hdf5_compat3.nc tst_misc.sh tdset.h5 tst_szip.sh ref_szip.h5 \ ref_szip.cdl tst_filter.sh bzip2.cdl filtered.cdl unfiltered.cdl \ ref_bzip2.c findplugin.in perftest.sh - CLEANFILES = tst_mpi_parallel.bin cdm_sea_soundings.nc bm_chunking.nc \ bm_radar.nc bm_radar1.nc radar_3d_compression_test.txt \ radar_3d_compression.txt radar_2d_compression.txt \ @@ -151,7 +150,7 @@ tst_interops2.h4 tst_h5_endians.nc tst_h4_lendian.h4 test.nc \ tst_atts_string_rewrite.nc tst_empty_vlen_unlim.nc \ tst_empty_vlen_lim.nc tst_parallel4_simplerw_coll.nc \ tst_fill_attr_vanish.nc tst_rehash.nc testszip.nc test.h5 \ -szip_dump.cdl perftest.txt bigmeta.nc bigvars.nc +szip_dump.cdl perftest.txt bigmeta.nc bigvars.nc run_par_test.sh DISTCLEANFILES = findplugin.sh diff --git a/nc_test4/run_par_test.sh.in b/nc_test4/run_par_test.sh.in index 56ddc3d72..032aee4de 100644 --- a/nc_test4/run_par_test.sh.in +++ b/nc_test4/run_par_test.sh.in @@ -1,9 +1,9 @@ #!/bin/sh -if test "x$srcdir" = x ; then srcdir=`pwd`; fi -. ../test_common.sh +# This .in file is processed at build time into a shell that runs some +# parallel I/O tests for HDF5 parallel I/O. -# This shell runs some parallel I/O tests. +# Ed Hartnett, Dennis Heimbigner, Ward Fisher set -e echo