Merge pull request #110 from BerkeleyLab/return-to-print

rouson · web-flow · commit 32668dc952ce · 2025-09-11T10:36:53.000-07:00
Fix ifx support
diff --git a/src/julienne/julienne_test_harness_s.F90 b/src/julienne/julienne_test_harness_s.F90
@@ -6,7 +6,6 @@
 submodule(julienne_test_harness_m) julienne_test_harness_s
   use iso_fortran_env, only : int64, real64
   use julienne_command_line_m, only : command_line_t
-  use julienne_one_image_prints_m, only : one_image_prints
   use julienne_string_m, only : string_t
   implicit none
 
@@ -37,11 +36,14 @@
 #else
       associate(me => 1, image_count => 1)
 #endif
-        call one_image_prints("")
-        call one_image_prints("Test-suite execution time: " // string_t(real(end_time - start_time, real64)/real(clock_rate, real64)) // " seconds")
-        call one_image_prints("Number of images: " // string_t(image_count))
-        call one_image_prints("")
-        call one_image_prints("_____ " // string_t(passes) // " of " // string_t(tests) // " tests passed. " // string_t(skips) // " tests were skipped _____")
+        if (me==1) then
+          print *
+          print '(*(a,:,en10.2))', "Test-suite run time: ", real(end_time - start_time, real64)/real(clock_rate, real64), " seconds"
+          print '(a,i0)',      "Number of images: ", image_count
+          print *
+          print '(*(a,:,i0))', "_____ ", passes, " of ", tests, " tests passed. ", skips, " tests were skipped _____"
+          print *
+        end if
         if (passes + skips /= tests .and. me==1) error stop "Some tests failed."
       end associate
 
@@ -57,16 +59,22 @@ subroutine print_usage_info_and_stop_if_requested
         'angular brackets (<>) denote a user-provided value, and passing a substring limits execution to' // new_line('') // &
         'the tests with test subjects or test descriptions containing the user-specified substring.' // new_line('')
 
-      associate(command_line => command_line_t())
+#if HAVE_MULTI_IMAGE_SUPPORT
+      associate(me => this_image())
+#else
+      associate(me => 1)
+#endif
+        associate(command_line => command_line_t())
 
-        if (command_line%argument_present([character(len=len("--help"))::"--help","-h"])) then
-          call one_image_prints(usage)
-          stop
-        end if
+          if (command_line%argument_present([character(len=len("--help"))::"--help","-h"])) then
+            if (me==1) print '(a)', usage
+            stop
+          end if
 
-        call one_image_prints(new_line("") // "Append '-- --help' or '-- -h' to your `fpm test` command to display usage information.")
+          if (me==1) print '(a)', new_line("") // "Append '-- --help' or '-- -h' to your `fpm test` command to display usage information."
 
+        end associate
       end associate
     end subroutine
 
-end submodule julienne_test_harness_s
+end submodule julienne_test_harness_s
diff --git a/src/julienne/julienne_test_s.F90 b/src/julienne/julienne_test_s.F90
@@ -5,7 +5,6 @@
 
 submodule(julienne_test_m) julienne_test_s
   use julienne_test_description_m, only : test_description_t
-  use julienne_one_image_prints_m, only : one_image_prints
   use julienne_string_m, only : string_t
   implicit none
 
@@ -35,8 +34,7 @@
 #if HAVE_MULTI_IMAGE_SUPPORT
     associate(me => this_image())
 #else
-    integer me
-    me = 1
+    associate(me => 1)
 #endif
       image_1_prints_usage_info: &
       if (me==1) then
@@ -49,25 +47,17 @@
               character(len=:), allocatable :: search_string
               search_string = command_line%flag_value("--contains")
               if (len(search_string)==0) then
-                call one_image_prints( new_line('')    // &
+                if (me==1) print '(a)', new_line('') // &
                   "Running all tests." // new_line('') // &
-                  "(Add '-- --contains <string>' to run only tests with subjects or descriptions containing the specified string.)")
+                  "(Add '-- --contains <string>' to run only tests with subjects or descriptions containing the specified string.)"
               else
-#ifndef NAGFOR
-                call one_image_prints(new_line('') // "Running only tests with subjects or descriptions containing '" // search_string // "'.")
-#else
-                call one_image_prints(new_line('') // "Running only tests with subjects or descriptions containing '" // string_t(search_string) // "'.")
-#endif
+                if (me==1) print '(a)', new_line('') // "Running only tests with subjects or descriptions containing '" // search_string // "'."
               end if
             end block
           end if first_report
         end block
 
-#ifndef NAGFOR
-        call one_image_prints(new_line('') // test%subject())
-#else
-        call one_image_prints(new_line('') // string_t(test%subject()))
-#endif
+        if (me==1) print '(a)', new_line('') // test%subject()
 
       end if image_1_prints_usage_info
 
@@ -79,11 +69,7 @@
             block
               integer i
               do i=1,num_tests
-#ifndef NAGFOR
-                call one_image_prints("   " // test_results(i)%characterize())
-#else
-                call one_image_prints("   " // string_t(test_results(i)%characterize()))
-#endif
+                if (me==1) print '(a)', "   " // test_results(i)%characterize()
               end do
             end block
           end if
@@ -97,16 +83,13 @@
             call co_all(skipped_tests)
 
             associate(num_passes => count(passing_tests), num_skipped => count(skipped_tests))
-              call one_image_prints(" " // string_t(num_passes) // " of " // string_t(num_tests) // " tests passed. " // string_t(num_skipped) // " tests were skipped.")
+              if (me==1) print '(*(a,:,i0))', " ", num_passes, " of ", num_tests, " tests passed. ", num_skipped, " tests were skipped."
               passes = passes + num_passes
               skips  = skips  + num_skipped
             end associate
           end block
         end associate
-#if HAVE_MULTI_IMAGE_SUPPORT
       end associate
-#endif
-
 #else
       block
         logical, allocatable :: passing_tests(:)
@@ -118,13 +101,13 @@
           tests = tests + num_tests
           if (me==1) then
             do i=1,num_tests
-              call one_image_prints(test_results(i)%characterize())
+              print '(a)', test_results(i)%characterize()
             end do
           end if
           passing_tests = test_results%passed()
           call co_all(passing_tests)
           associate(num_passes => count(passing_tests))
-            call one_image_prints(" " // string_t(num_passes) // " of " // string_t(num_tests) // " tests passed.")
+            if (me==1) print '(a)', " " // string_t(num_passes) // " of " // string_t(num_tests) // " tests passed."
             passes = passes + num_passes
           end associate
         end associate
diff --git a/test/idiomatic_assertion_failure_test.F90 b/test/idiomatic_assertion_failure_test.F90
@@ -16,15 +16,14 @@ program idiomatic_assertion_failure_test
 #endif
     if (.not. command_line%argument_present([character(len=len("--help"))::"--help","-h"])) then
 #ifdef RUN_FALSE_ASSERTIONS
-      call one_image_prints(new_line('') // 'Test the intentional failure of an idiomatic assertion: ' // new_line(''))
+      if (me==1) print '(a)', new_line('') // 'Test the intentional failure of an idiomatic assertion: ' // new_line('')
       call_julienne_assert(1 .equalsExpected. 2)
 #else
-      call one_image_prints( &
+      if (me==1) print '(a)',  &
            new_line('') // &
            'Skipping the test in ' // __FILE__ // '.' // new_line('') // &
            'Add the following to your fpm command to test assertion failures: --flag "-DASSERTIONS -DRUN_FALSE_ASSERTIONS"' // &
-           new_line('') &
-      )
+           new_line('')
 #endif
     end if
   end associate
diff --git a/test/logical_assertion_failure_test.F90 b/test/logical_assertion_failure_test.F90
@@ -6,7 +6,7 @@
 
 program logical_assertion_failure_test
   !! Conditionally test an assertion that is hardwired to fail.
-  use julienne_m, only : call_julienne_assert_, command_line_t, operator(.equalsExpected.),one_image_prints 
+  use julienne_m, only : call_julienne_assert_, command_line_t, operator(.equalsExpected.)
   implicit none
   integer, allocatable :: array(:)
 
@@ -17,16 +17,15 @@ program logical_assertion_failure_test
 #endif
     if (.not. command_line%argument_present([character(len=len("--help"))::"--help","-h"])) then
 #ifdef RUN_FALSE_ASSERTIONS
-      call one_image_prints(new_line('') // 'Test the intentional failure of a logical assertion: ' // new_line(''))
+      if (me==1) print '(a)', new_line('') // 'Test the intentional failure of a logical assertion: ' // new_line('')
       if (allocated(array)) deallocate(array)
       call_julienne_assert(allocated(array))
 #else
-      call one_image_prints( &
+      if (me==1) print '(a)', &
           new_line('') // &
           'Skipping the test in ' // __FILE__ // '.' // new_line('') // &
           'Add the following to your fpm command to test assertion failures: --flag "-DASSERTIONS -DRUN_FALSE_ASSERTIONS"' // &
-          new_line('') &
-      )
+          new_line('')
 #endif
     end if
   end associate
diff --git a/test/modules/command_line_test_m.F90 b/test/modules/command_line_test_m.F90
@@ -8,7 +8,6 @@ module command_line_test_m
   use julienne_m, only : &
      command_line_t &
     ,GitHub_CI &
-    ,one_image_prints &
     ,operator(.equalsExpected.) &
     ,operator(.expect.) &
     ,string_t &
@@ -77,12 +76,11 @@ function results() result(test_results)
         ,test_description_t(string_t("argument_present() result is .true. if a command-line argument is present")) &
       ]
       if (me==1) then
-        call one_image_prints( &
+        print '(a)', &
           new_line('') &
           // "----> Skipping the command_line_t tests in GitHub CI." // new_line('') &
           // "----> To test locally, append the following flags to the 'fpm test' command: -- --test command_line_t --type" &
-          // new_line('') &
-          )
+          // new_line('')
       end if
     else if (.not. command_line%argument_present(["--test"])) then ! skip the tests if not explicitly requested
       test_descriptions = [ &
@@ -93,11 +91,10 @@ function results() result(test_results)
         ,test_description_t(string_t("argument_present() result is .true. if a command-line argument is present")) &
       ]
       if (me==1) then
-        call one_image_prints( &
+        print '(a)', &
           new_line('') &
           // "-----> To test command_line_t, append the following to the 'fpm test' command: -- --test command_line_t --type" &
-          // new_line('') &
-        )
+          // new_line('')
       end if
     else ! run the tests
 #if HAVE_PROCEDURE_ACTUAL_FOR_POINTER_DUMMY
