Skip to content

Commit 92c085d

Browse files
ceblantonceblanton
authored
Merge pull request #331 from underwoo/remove.bats
Remove bats from remaining tests
2 parents da1ce43 + 83907d0 commit 92c085d

File tree

183 files changed

+3140
-7901207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+3140
-7901207
lines changed

‎.github/workflows/distcheck.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Github actions CI file
2+
# Ryan Mulhall 2020
3+
# CI testing for the FRE-NCtools repo, builds and runs unit tests
4+
# image dockerfile is maintained here:
5+
# https://gitlab.gfdl.noaa.gov/fre/hpc-me
6+
name: FRE-NCtools CI
7+
on:
8+
workflow_run:
9+
workflows: ["FRE-NCtools Check Expensive"]
10+
types:
11+
- completed
12+
jobs:
13+
CI:
14+
runs-on: ubuntu-latest
15+
strategy:
16+
matrix:
17+
with_mpi: ['','--with-mpi']
18+
enable_quad_precision: ['', '--enable-quad-precision']
19+
container:
20+
image: ghcr.io/noaa-gfdl/fre-nctools-ci-rocky-gnu:14.2.0_v2
21+
env:
22+
MPI: ${{ matrix.with_mpi }}
23+
QUAD_P: ${{ matrix.enable_quad_precision }}
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
with:
28+
submodules: recursive
29+
- name: Configure
30+
run: |
31+
mkdir build && cd build
32+
autoreconf -i ../configure.ac
33+
../configure $MPI $QUAD_P || cat config.log
34+
- name: Build distribution with check
35+
run: make DISTCHECK_CONFIGURE_FLAGS="$MPI $QUAD_P" -C build -j
36+
- name: Save log file on failure
37+
uses: actions/upload-artifact@v4.4.0
38+
if: failure()
39+
with:
40+
name: test-suites
41+
path: |
42+
build/tests/test-suite.log

‎.github/workflows/main.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,14 @@ jobs:
2727
mkdir build && cd build
2828
autoreconf -i ../configure.ac
2929
../configure $MPI $QUAD_P || cat config.log
30-
- name: Build tools
30+
- name: Build
3131
run: make -C build -j
32-
- name: Run all tests
33-
if: matrix.with_mpi == ''
34-
run: make -C build -j check SH_LOG_DRIVER_FLAGS=--comments
3532
- name: Run most tests (skip the slow ones)
36-
if: matrix.with_mpi == '--with-mpi'
37-
env:
38-
SKIP_TESTS: 4
39-
run: make -C build -j check SH_LOG_DRIVER_FLAGS=--comments
33+
run: make -C build -j check
4034
- name: Save log file on failure
4135
uses: actions/upload-artifact@v4.4.0
4236
if: failure()
4337
with:
4438
name: test-suites
4539
path: |
46-
build/t/test-suite.log
4740
build/tests/test-suite.log

‎.github/workflows/main_expensive.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Github actions CI file
2+
# Ryan Mulhall 2020
3+
# CI testing for the FRE-NCtools repo, builds and runs unit tests
4+
# image dockerfile is maintained here:
5+
# https://gitlab.gfdl.noaa.gov/fre/hpc-me
6+
name: FRE-NCtools Check Expensive
7+
on:
8+
workflow_run:
9+
workflows: ["FRE-NCtools CI"]
10+
types:
11+
- completed
12+
jobs:
13+
CI:
14+
runs-on: ubuntu-latest
15+
strategy:
16+
matrix:
17+
with_mpi: ['','--with-mpi']
18+
enable_quad_precision: ['', '--enable-quad-precision']
19+
container:
20+
image: ghcr.io/noaa-gfdl/fre-nctools-ci-rocky-gnu:14.2.0_v2
21+
env:
22+
MPI: ${{ matrix.with_mpi }}
23+
QUAD_P: ${{ matrix.enable_quad_precision }}
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
with:
28+
submodules: recursive
29+
- name: Configure
30+
run: |
31+
mkdir build && cd build
32+
autoreconf -i ../configure.ac
33+
../configure $MPI $QUAD_P || cat config.log
34+
- name: Build
35+
run: make -C build -j
36+
- name: Run most tests (skip the slow ones)
37+
run: make -C build check-very-expensive
38+
- name: Save log file on failure
39+
uses: actions/upload-artifact@v4.4.0
40+
if: failure()
41+
with:
42+
name: test-suites
43+
path: |
44+
build/tests/test-suite.log

‎.gitignore

Lines changed: 49 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.gz
55
build.fre-nctools*
66
build
7+
_build
78
*.exe
89
*.1
910
.DS_Store
@@ -22,6 +23,7 @@ Makefile.in
2223
# http://www.gnu.org/software/autoconf
2324

2425
.deps
26+
.dirstamp
2527
autom4te.cache
2628
/autoscan.log
2729
/autoscan-*.log
@@ -64,36 +66,62 @@ t/Test26/
6466
*.nc
6567

6668
# Other build generated files
69+
gt-*/
6770
config.h
6871
*.mod
69-
postprocessing/land_utils/combine-ncc
70-
postprocessing/land_utils/decompress-ncc
71-
postprocessing/land_utils/is-compressed
72-
postprocessing/land_utils/nfu_compress_mod.mod
73-
postprocessing/land_utils/nfu_mod.mod
74-
postprocessing/land_utils/scatter-ncc
75-
postprocessing/mppnccombine/mppnccombine
76-
postprocessing/plevel/moisture_convert_mod.mod
77-
postprocessing/plevel/pinterp_utilities_mod.mod
78-
postprocessing/plevel/plev_constants_mod.mod
79-
postprocessing/plevel/pressure_interp_mod.mod
72+
src/combine_restarts
73+
src/combine-ncc
74+
src/decompress-ncc
75+
src/iceberg_comb.sh
76+
src/is-compressed
77+
src/list_ncvars
78+
src/list_ncvars.csh
79+
src/list_ncvars.sh
80+
src/scatter-ncc
81+
src/mppnccombine
82+
src/plevel-interp
83+
src/plevel.sh
84+
src/print_version
85+
src/split_ncvars.pl
86+
src/timavg
87+
src/timavg.csh
88+
src/time_average
89+
src/version.h
90+
src/version.inc
91+
tests/c_test_version
92+
tests/create_5degree_topog
93+
tests/create_daily_tile_files
94+
tests/create_land_remap_files
95+
tests/create_mask_topog
96+
tests/create_ocean_mask_grid
97+
tests/create_plevel_test_ncfile
98+
tests/create_regional_file
99+
tests/create_runoff_file
100+
tests/create_temp_salt_file
101+
tests/create_timeavg_test_ncfiles
102+
tests/f_test_version
80103
tools/check_mask/check_mask
81104
tools/cubic_utils/make_remap_file
82105
tools/fregrid/fregrid
106+
tools/fregrid/fregrid_parallel
83107
tools/make_coupler_mosaic/make_coupler_mosaic
108+
tools/make_coupler_mosaic/make_coupler_mosaic_parallel
84109
tools/make_hgrid/make_hgrid
85110
tools/make_land_domain/make_land_domain
86111
tools/make_quick_mosaic/make_quick_mosaic
87112
tools/make_regional_mosaic/make_regional_mosaic
88113
tools/make_solo_mosaic/make_solo_mosaic
89114
tools/make_topog/make_topog
115+
tools/make_topog/make_topog_parallel
90116
tools/make_vgrid/make_vgrid
91117
tools/mppncscatter/mppncscatter
92118
tools/nc_null_check/nc_null_check
93119
tools/ncexists/ncexists
94120
tools/remap_land/remap_land
121+
tools/remap_land/remap_land_parallel
95122
tools/river_regrid/river_regrid
96123
tools/runoff_regrid/runoff_regrid
124+
tools/runoff_regrid/runoff_regrid_parallel
97125
tools/simple_hydrog/lakes/cr_lake_files
98126
tools/simple_hydrog/libfmslite/constants_mod.mod
99127
tools/simple_hydrog/libfmslite/horiz_interp_bilinear_mod.mod
@@ -104,3 +132,13 @@ tools/simple_hydrog/postp/cp_river_vars
104132
tools/simple_hydrog/rmvpr/rmv_parallel_rivers
105133
tools/transfer_to_mosaic_grid/transfer_to_mosaic_grid
106134

135+
# Ignore generated files from vscode makefile extension
136+
defines.awk
137+
subs*.awk
138+
conftest
139+
conftest.*
140+
confdefs.*
141+
confinc.*
142+
confmf.*
143+
conf*/
144+
conf*.file

‎.vscode/c_cpp_properties.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
"/opt/homebrew/include"
88
],
99
"defines": [],
10-
"macFrameworkPath": [
11-
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
12-
],
1310
"compilerPath": "/usr/bin/clang",
1411
"cStandard": "c17",
1512
"cppStandard": "c++17",
@@ -22,9 +19,6 @@
2219
"${HOME}/opt/homebrew/include"
2320
],
2421
"defines": [],
25-
"macFrameworkPath": [
26-
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
27-
],
2822
"compilerPath": "/usr/bin/clang",
2923
"cStandard": "c17",
3024
"cppStandard": "c++17",

‎.vscode/settings.json

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,29 @@
3636
"/#include.*/",
3737
]
3838
}
39-
]
39+
],
40+
"makefile.dryrunSwitches": [
41+
"--always-make",
42+
"--print-directory",
43+
"--dry-run",
44+
"--assume-old=Makefile",
45+
"Makefile",
46+
"all",
47+
"AM_MAKEFLAGS=--assume-old=Makefile Makefile"
48+
],
49+
"fortran.linter.includePaths": [
50+
"/opt/homebrew/include",
51+
"${workspaceFolder}/**"
52+
],
53+
"fortran.fortls.preprocessor.directories": [
54+
"/opt/homebrew/include",
55+
"./lib"
56+
],
57+
"fortran.fortls.suffixes": [
58+
"inc"
59+
],
60+
"fortran.fortls.directories": [
61+
"./**",
62+
"/opt/homebrew/include"
63+
],
4064
}

0 commit comments

Comments
 (0)