Skip to content

Commit 81aa767

Browse files
committed
remove unused logic
1 parent 87b3209 commit 81aa767

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

.github/workflows/ci_windows.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ jobs:
2727
# - run: cmake --preset=makewin
2828
# - run: cmake --build build --parallel
2929

30-
# - run: ctest --parallel 2 --output-on-failure
31-
# working-directory: build
30+
# - run: ctest --test-dir build --parallel 2 --output-on-failure
3231

3332
msys2:
3433
timeout-minutes: 20
@@ -64,8 +63,7 @@ jobs:
6463

6564
- run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=${HOME}
6665
- run: cmake --build Examples/build
67-
- run: ctest --parallel 2 --output-on-failure
68-
working-directory: Examples/build
66+
- run: ctest --test-dir Examples/build --parallel 2 --output-on-failure
6967

7068
- name: create package
7169
if: github.event.action == 'published'

cmake/compilers.cmake

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(CheckSourceCompiles)
2-
31
# check C and Fortran compiler ABI compatibility
42

53
if(NOT abi_ok)
@@ -24,11 +22,3 @@ $<$<C_COMPILER_ID:Intel,IntelLLVM>:$<IF:$<BOOL:${WIN32}>,/QxHost,-xHost>>
2422
"$<$<AND:$<COMPILE_LANG_AND_ID:Fortran,GNU>,$<CONFIG:Release>>:-fno-backtrace;-Wno-maybe-uninitialized>"
2523
"$<$<AND:$<COMPILE_LANG_AND_ID:Fortran,GNU>,$<CONFIG:RelWithDebInfo>>:-Wno-maybe-uninitialized>"
2624
)
27-
28-
check_source_compiles(Fortran
29-
"program test
30-
block
31-
end block
32-
end program
33-
"
34-
f08block)

src/tests/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,9 @@ endforeach()
5050
endfunction(setup_test)
5151

5252
# --- all other tests
53-
set(testnames array attributes deflate error exist module layout lt scalar shape string
53+
set(testnames array attributes deflate destructor error exist module layout lt scalar shape string
5454
fail_read_size_mismatch fail_read_rank_mismatch fail_nonexist_variable)
5555

56-
if(f08block)
57-
list(APPEND testnames destructor)
58-
else()
59-
message(STATUS "SKIP: destructor test since compiler can't do F2008 block")
60-
endif()
61-
6256
setup_test("${testnames}")
6357

6458
set(shape_file ${CMAKE_CURRENT_BINARY_DIR}/test_shape.h5)

0 commit comments

Comments
 (0)