Skip to content

Commit 0792c17

Browse files
authored
Merge pull request #125 from BerkeleyLab/rm-one_image_prints_m
Remove one_image_prints_{m,s} module and submodule
2 parents 7543060 + 003fe4e commit 0792c17

6 files changed

Lines changed: 26 additions & 115 deletions

src/julienne/julienne_one_image_prints_m.f90

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/julienne/julienne_one_image_prints_s.F90

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/julienne_m.f90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module julienne_m
1111
use julienne_file_m, only : file_t
1212
use julienne_formats_m, only : separated_values, csv
1313
use julienne_github_ci_m, only : github_ci
14-
use julienne_one_image_prints_m, only : one_image_prints
1514
use julienne_string_m, only : string_t, array_of_strings &
1615
,operator(.cat.) &
1716
,operator(.csv.) &

test/idiomatic_assertion_failure_test.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
program idiomatic_assertion_failure_test
88
!! Conditionally test an assertion that is hardwired to fail.
9-
use julienne_m, only : call_julienne_assert_, command_line_t, operator(.equalsExpected.), one_image_prints
9+
use julienne_m, only : call_julienne_assert_, command_line_t, operator(.equalsExpected.)
1010
implicit none
1111

1212
#if HAVE_MULTI_IMAGE_SUPPORT

test/legacy-driver.F90

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ program legacy_driver
99
#ifdef __GNUC__
1010
#if (GCC_VERSION < 140300)
1111
! Internal utilities
12-
use julienne_m, only : command_line_t, GitHub_CI, one_image_prints, string_t
12+
use julienne_m, only : command_line_t, GitHub_CI
1313

1414
! Test modules
1515
use assert_test_m ,only : assert_test_t
@@ -45,36 +45,34 @@ program legacy_driver
4545

4646
if (command_line%argument_present([character(len=len("--help"))::"--help","-h"])) stop usage
4747

48-
call one_image_prints(new_line("") // "Append '-- --help' or '-- -h' to your `fpm test` command to display usage information.")
48+
associate(me => this_image())
4949

50-
call assert_test%report(passes, tests, skips)
51-
call bin_test%report(passes, tests, skips)
52-
call formats_test%report(passes, tests, skips)
53-
call string_test%report(passes, tests, skips)
54-
call test_result_test%report(passes, tests, skips)
55-
call test_description_test%report(passes, tests, skips)
56-
call test_diagnosis_test%report(passes, tests, skips)
50+
if (me==1) print '(a)', new_line("") // "Append '-- --help' or '-- -h' to your `fpm test` command to display usage information."
5751

58-
if (.not. GitHub_CI()) then
59-
if (command_line%argument_present(["--test"])) then
60-
call command_line_test%report(passes, tests, skips)
61-
else
62-
call one_image_prints( &
63-
new_line("") // &
64-
"To test Julienne's command_line_t type, append the following to your fpm command:" // &
65-
new_line("") // &
66-
"-- --test command_line_t --type" &
67-
)
52+
call assert_test%report(passes, tests, skips)
53+
call bin_test%report(passes, tests, skips)
54+
call formats_test%report(passes, tests, skips)
55+
call string_test%report(passes, tests, skips)
56+
call test_result_test%report(passes, tests, skips)
57+
call test_description_test%report(passes, tests, skips)
58+
call test_diagnosis_test%report(passes, tests, skips)
59+
60+
if (.not. GitHub_CI()) then
61+
if (command_line%argument_present(["--test"])) then
62+
call command_line_test%report(passes, tests, skips)
63+
else
64+
if (me==1) print '(a)', &
65+
new_line("") // &
66+
"To test Julienne's command_line_t type, append the following to your fpm command:" // &
67+
new_line("") // &
68+
"-- --test command_line_t --type"
69+
end if
6870
end if
69-
end if
7071

71-
if (this_image()==1) then
72-
call one_image_prints( &
73-
"_____ In total, " // string_t(passes) // " of " // string_t(tests) // " tests pass. " // &
74-
string_t(skips) // " tests were skipped. _____" &
75-
)
72+
if (me==1) print '(*(a,:,i0))', "_____ In total, ", passes, " of ", tests, " tests pass. ", skips, " tests were skipped. _____"
73+
sync all
7674
if (passes + skips /= tests) error stop "Some executed tests failed."
77-
end if
75+
end associate
7876

7977
#endif
8078
#endif

test/legacy-unit_test_failure_test.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ program legacy_unit_test_failure_test
55
# if (GCC_VERSION < 140300)
66

77
! Internal utilities
8-
use julienne_m, only : command_line_t, GitHub_CI, one_image_prints, string_t
8+
use julienne_m, only : command_line_t, GitHub_CI, string_t
99
use test_test_m, only : test_test_t
1010
implicit none
1111

0 commit comments

Comments
 (0)