Skip to content

Commit

Permalink
Remove extra verbosity, now that problem is fixed
Browse files Browse the repository at this point in the history 
Signed-off-by: Quincey Koziol <[email protected]>
  • Loading branch information
@qkoziol
qkoziol committed Apr 14, 2024
1 parent 1c58c50 commit 217edb0
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 133 deletions.
150 changes: 75 additions & 75 deletions .github/workflows/autotools.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,87 +27,87 @@ permissions:
# in parallel. We just have one job, but the matrix items defined below will
# run in parallel.
jobs:
# call-workflow-special-autotools:
# name: "Autotools Special Workflows"
# uses: ./.github/workflows/main-auto-spc.yml
#
# call-parallel-special-autotools:
# name: "Autotools Parallel Special Workflows"
# uses: ./.github/workflows/main-auto-par-spc.yml
#
# call-debug-parallel-autotools:
# name: "Autotools Parallel Workflows"
# uses: ./.github/workflows/main-auto-par.yml
# with:
# build_mode: "debug"
#
# call-release-parallel-autotools:
# name: "Autotools Parallel Workflows"
# uses: ./.github/workflows/main-auto-par.yml
# with:
# build_mode: "production"
#
# call-debug-thread-autotools:
# name: "Autotools Debug Thread-Safety Workflows"
# uses: ./.github/workflows/main-auto.yml
# with:
# thread_safety: enable
# build_mode: "debug"
#
# call-release-thread-autotools:
# name: "Autotools Release Thread-Safety Workflows"
# uses: ./.github/workflows/main-auto.yml
# with:
# thread_safety: enable
# build_mode: "production"
#
# call-debug-autotools:
# name: "Autotools Debug Workflows"
# uses: ./.github/workflows/main-auto.yml
# with:
# thread_safety: disable
# build_mode: "debug"
#
# call-release-autotools:
# name: "Autotools Release Workflows"
# uses: ./.github/workflows/main-auto.yml
# with:
# thread_safety: disable
# build_mode: "production"
#
call-workflow-special-autotools:
name: "Autotools Special Workflows"
uses: ./.github/workflows/main-auto-spc.yml

call-parallel-special-autotools:
name: "Autotools Parallel Special Workflows"
uses: ./.github/workflows/main-auto-par-spc.yml

call-debug-parallel-autotools:
name: "Autotools Parallel Workflows"
uses: ./.github/workflows/main-auto-par.yml
with:
build_mode: "debug"

call-release-parallel-autotools:
name: "Autotools Parallel Workflows"
uses: ./.github/workflows/main-auto-par.yml
with:
build_mode: "production"

call-debug-thread-autotools:
name: "Autotools Debug Thread-Safety Workflows"
uses: ./.github/workflows/main-auto.yml
with:
thread_safety: enable
build_mode: "debug"

call-release-thread-autotools:
name: "Autotools Release Thread-Safety Workflows"
uses: ./.github/workflows/main-auto.yml
with:
thread_safety: enable
build_mode: "production"

call-debug-autotools:
name: "Autotools Debug Workflows"
uses: ./.github/workflows/main-auto.yml
with:
thread_safety: disable
build_mode: "debug"

call-release-autotools:
name: "Autotools Release Workflows"
uses: ./.github/workflows/main-auto.yml
with:
thread_safety: disable
build_mode: "production"

call-release-auto-intel:
name: "Autotools Intel Workflows"
uses: ./.github/workflows/intel-auto.yml
with:
build_mode: "production"

# call-release-auto-nvhpc:
# name: "Autotools nvhpc Workflows"
# uses: ./.github/workflows/nvhpc-auto.yml
# with:
# build_mode: "production"
#
# call-release-auto-aocc:
# name: "Autotools aocc Workflows"
# uses: ./.github/workflows/aocc-auto.yml
# with:
# build_mode: "production"
#
# call-release-auto-cygwin:
# name: "Autotools Cygwin Workflows"
# uses: ./.github/workflows/cygwin-auto.yml
# with:
# build_mode: "production"
#
# call-release-auto-julia:
# name: "Autotools Julia Workflows"
# uses: ./.github/workflows/julia-auto.yml
# with:
# build_mode: "production"
#
# call-release-auto-xpr:
# name: "Autotools TestExpress Workflows"
# uses: ./.github/workflows/testxpr-auto.yml
call-release-auto-nvhpc:
name: "Autotools nvhpc Workflows"
uses: ./.github/workflows/nvhpc-auto.yml
with:
build_mode: "production"

call-release-auto-aocc:
name: "Autotools aocc Workflows"
uses: ./.github/workflows/aocc-auto.yml
with:
build_mode: "production"

call-release-auto-cygwin:
name: "Autotools Cygwin Workflows"
uses: ./.github/workflows/cygwin-auto.yml
with:
build_mode: "production"

call-release-auto-julia:
name: "Autotools Julia Workflows"
uses: ./.github/workflows/julia-auto.yml
with:
build_mode: "production"

call-release-auto-xpr:
name: "Autotools TestExpress Workflows"
uses: ./.github/workflows/testxpr-auto.yml

# workflow-msys2-autotools:
# name: "CMake msys2 Workflows"
Expand Down
11 changes: 5 additions & 6 deletions config/conclude.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST)
TEST_EXTENSIONS = .sh
SH_LOG_COMPILER = $(SHELL)
AM_SH_LOG_FLAGS =
#REALTIMEOUTPUT = $(realtimeOutput)
REALTIMEOUTPUT = yes
REALTIMEOUTPUT = $(realtimeOutput)

# lib/progs/tests targets recurse into subdirectories. build-* targets
# build files in this directory.
Expand Down Expand Up @@ -147,9 +146,9 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
else \
echo "Testing: $${tname} $(TEST_FLAGS)"; \
if test -n "$(REALTIMEOUTPUT)"; then \
echo "Test log for $${tname} $(TEST_FLAGS)" ; \
echo "Test log for $${tname} $(TEST_FLAGS)" | tee -a $${log}; \
else \
echo "Test log for $${tname} $(TEST_FLAGS)" ; \
echo "Test log for $${tname} $(TEST_FLAGS)" >> $${log}; \
fi; \
fi; \
if test -n "$(REALTIMEOUTPUT)"; then \
Expand All @@ -174,13 +173,13 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
fi; \
if test -n "$(REALTIMEOUTPUT)"; then \
srcdir="$(srcdir)" \
$(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) \
$(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) | tee -a $${log} 2>&1 \
&& touch $(@:.chkexe_=.chkexe) || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
(cat $${log} && false) || exit 1; \
else \
srcdir="$(srcdir)" \
$(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) \
$(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \
&& touch $(@:.chkexe_=.chkexe) || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
(cat $${log} && false) || exit 1; \
Expand Down
56 changes: 27 additions & 29 deletions test/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_builddir)/src
# test_vds_env.sh: vds_env
# test_vds_swmr.sh: vds_swmr*
# test_use_cases.sh: use_append_chunk, use_append_mchunks, use_disable_mdc_flushes
#TEST_SCRIPT = test_abort_fail.sh test_check_version.sh test_error.sh \
# test_flush_refresh.sh test_external_env.sh test_libinfo.sh \
# test_links_env.sh test_swmr.sh test_vds_env.sh test_vds_swmr.sh \
# test_use_cases.sh
TEST_SCRIPT = test_abort_fail.sh test_check_version.sh test_error.sh \
test_flush_refresh.sh test_external_env.sh test_libinfo.sh \
test_links_env.sh test_swmr.sh test_vds_env.sh test_vds_swmr.sh \
test_use_cases.sh
SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) links_env$(EXEEXT) \
external_env$(EXEEXT) filenotclosed$(EXEEXT) del_many_dense_attrs$(EXEEXT) \
flushrefresh$(EXEEXT) use_append_chunk$(EXEEXT) use_append_mchunks$(EXEEXT) use_disable_mdc_flushes$(EXEEXT) \
Expand All @@ -46,31 +46,30 @@ SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) links_env$(EXEEXT) \
swmr_sparse_reader$(EXEEXT) swmr_sparse_writer$(EXEEXT) swmr_start_write$(EXEEXT) \
vds_env$(EXEEXT) vds_swmr_gen$(EXEEXT) vds_swmr_reader$(EXEEXT) vds_swmr_writer$(EXEEXT)
if HAVE_SHARED_CONDITIONAL
# TEST_SCRIPT += test_plugin.sh
TEST_SCRIPT += test_plugin.sh
SCRIPT_DEPEND += filter_plugin$(EXEEXT) vfd_plugin $(EXEEXT) vol_plugin$(EXEEXT)
endif
if MIRROR_VFD_CONDITIONAL
# TEST_SCRIPT += test_mirror.sh
TEST_SCRIPT += test_mirror.sh
endif

check_SCRIPTS = #
check_SCRIPTS = $(TEST_SCRIPT)

# These are our main targets. They should be listed in the order to be
# executed, generally most specific tests to least specific tests.
# As an exception, long-running tests should occur earlier in the list.
# This gives them more time to run when tests are executing in parallel.
TEST_PROG= ttsafe
#TEST_PROG= testhdf5 \
# cache cache_api cache_image cache_tagging lheap ohdr \
# stab gheap evict_on_close farray earray btree2 fheap \
# accum hyperslab istore bittests dt_arith page_buffer \
# dtypes dsets chunk_info cmpd_dset mdset cmpd_dtransform filter_fail extend direct_chunk \
# external efc objcopy objcopy_ref links unlink twriteorder big mtime \
# fillval mount select_io_dset\
# flush1 flush2 app_ref enum set_extent ttsafe enc_dec_plist \
# enc_dec_plist_cross_platform getname vfd ros3 s3comms hdfs ntypes \
# dangle dtransform reserved cross_read freespace mf vds file_image \
# unregister cache_logging cork swmr vol timer event_set onion
TEST_PROG= testhdf5 \
cache cache_api cache_image cache_tagging lheap ohdr \
stab gheap evict_on_close farray earray btree2 fheap \
accum hyperslab istore bittests dt_arith page_buffer \
dtypes dsets chunk_info cmpd_dset mdset cmpd_dtransform filter_fail extend direct_chunk \
external efc objcopy objcopy_ref links unlink twriteorder big mtime \
fillval mount select_io_dset\
flush1 flush2 app_ref enum set_extent ttsafe enc_dec_plist \
enc_dec_plist_cross_platform getname vfd ros3 s3comms hdfs ntypes \
dangle dtransform reserved cross_read freespace mf vds file_image \
unregister cache_logging cork swmr vol timer event_set onion

# List programs to be built when testing here
#
Expand All @@ -92,19 +91,18 @@ TEST_PROG= ttsafe
#
# Also build testmeta, which is used for the timing test. It builds quickly
# and this lets automake keep all its test programs in one place.
check_PROGRAMS=$(TEST_PROG)
#check_PROGRAMS=$(TEST_PROG) error_test err_compat tcheck_version \
# testmeta accum_swmr_reader atomic_writer atomic_reader external_env \
# links_env filenotclosed del_many_dense_attrs flushrefresh \
# use_append_chunk use_append_chunk_mirror use_append_mchunks use_disable_mdc_flushes \
# swmr_generator swmr_start_write swmr_reader swmr_writer swmr_remove_reader \
# swmr_remove_writer swmr_addrem_writer swmr_sparse_reader swmr_sparse_writer \
# vds_env vds_swmr_gen vds_swmr_reader vds_swmr_writer
check_PROGRAMS=$(TEST_PROG) error_test err_compat tcheck_version \
testmeta accum_swmr_reader atomic_writer atomic_reader external_env \
links_env filenotclosed del_many_dense_attrs flushrefresh \
use_append_chunk use_append_chunk_mirror use_append_mchunks use_disable_mdc_flushes \
swmr_generator swmr_start_write swmr_reader swmr_writer swmr_remove_reader \
swmr_remove_writer swmr_addrem_writer swmr_sparse_reader swmr_sparse_writer \
vds_env vds_swmr_gen vds_swmr_reader vds_swmr_writer
if HAVE_SHARED_CONDITIONAL
# check_PROGRAMS+= filter_plugin vfd_plugin vol_plugin
check_PROGRAMS+= filter_plugin vfd_plugin vol_plugin
endif
if MIRROR_VFD_CONDITIONAL
# check_PROGRAMS+= mirror_vfd
check_PROGRAMS+= mirror_vfd
endif

# These programs generate test files for the tests. They don't need to be
Expand Down
Loading

0 comments on commit 217edb0

Please sign in to comment.