From 2b17c0cc681317b0b67f0c026793da27016fa35e Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Sun, 13 Nov 2022 14:35:48 -0700
Subject: [PATCH] ckp
---
.github/workflows/run_tests_osx.yml | 2 +-
.github/workflows/run_tests_ubuntu.yml | 2 +-
.github/workflows/run_tests_win_mingw.yml | 2 +-
dap4_test/CMakeLists.txt | 12 +++++-------
dap4_test/Makefile.am | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index fc73521c8..b85df0133 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -7,7 +7,7 @@
name: Run macOS-based netCDF Tests
-on: [pull_request, workflow_dispatch]
+on: [push,pull_request, workflow_dispatch]
jobs:
diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 618c13ed2..11353eb46 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -4,7 +4,7 @@
name: Run Ubuntu/Linux netCDF Tests
-on: [pull_request, workflow_dispatch]
+on: [push,pull_request, workflow_dispatch]
jobs:
diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml
index 5ff67e1a1..4b130a927 100644
--- a/.github/workflows/run_tests_win_mingw.yml
+++ b/.github/workflows/run_tests_win_mingw.yml
@@ -9,7 +9,7 @@ name: Run MSYS2, MinGW64-based Tests
env:
CPPFLAGS: "-D_BSD_SOURCE"
-on: [pull_request, workflow_dispatch]
+on: [push,pull_request, workflow_dispatch]
jobs:
diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt
index 460ff62be..287b0cbb0 100644
--- a/dap4_test/CMakeLists.txt
+++ b/dap4_test/CMakeLists.txt
@@ -58,18 +58,16 @@ ENDIF()
ENDIF(ENABLE_TESTS)
-FILE(COPY ./baselineraw DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
+#FILE(COPY ./baselineraw DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
#FILE(COPY ./baseline DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
#FILE(COPY ./cdltestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
-#FILE(COPY ./daptestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
-#FILE(COPY ./dmrtestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
+#FILE(COPY ./rawtestfiles DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
## Specify files to be distributed by 'make dist'
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh
-#${CMAKE_CURRENT_SOURCE_DIR}/daptestfiles
-#${CMAKE_CURRENT_SOURCE_DIR}/dmrtestfiles
-#${CMAKE_CURRENT_SOURCE_DIR}/cdltestfiles
-#${CMAKE_CURRENT_SOURCE_DIR}/baseline
+${CMAKE_CURRENT_SOURCE_DIR}/cdltestfiles
+${CMAKE_CURRENT_SOURCE_DIR}/rawtestfiles
+${CMAKE_CURRENT_SOURCE_DIR}/baseline
${CMAKE_CURRENT_SOURCE_DIR}/baselineraw
)
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am
index cd6d7ec38..8bfb3324f 100644
--- a/dap4_test/Makefile.am
+++ b/dap4_test/Makefile.am
@@ -52,7 +52,7 @@ EXTRA_DIST = CMakeLists.txt test_common.h \
d4test_common.sh \
test_curlopt.sh test_data.sh test_hyrax.sh test_meta.sh \
test_parse.sh test_raw.sh test_remote.sh test_thredds.sh \
- cdltestfiles rawtestfiles nctestfiles \
+ cdltestfiles rawtestfiles \
baseline baselineraw baselineremote baselinehyrax baselinethredds
CLEANFILES = *.exe