cleanup python test

Author: scivision

openmp/meson.build

@@ -1,4 +1,5 @@
 
 timeprec = executable('timeprec', 'timeprec.f90', dependencies : openmp)
 test('OpenMP:TimeMeasure', timeprec,
+  is_parallel: false,
   timeout: 30)

system/CMakeLists.txt

@@ -3,35 +3,25 @@ project(F18system Fortran)
 enable_testing()
 
 add_executable(color color_text.f90)
-add_test(NAME Color COMMAND color)
+add_test(NAME system:Color COMMAND color)
 
 add_library(osdet OBJECT os_detect.f90)
 
 add_executable(gitrev gitrev.f90)
-add_test(NAME Git COMMAND gitrev)
+add_test(NAME system:Git COMMAND gitrev)
 
 add_executable(complog compiler_log.f90)
-add_test(NAME Compiler COMMAND complog)
+add_test(NAME system:Compiler COMMAND complog)
 
 find_package(Python3 COMPONENTS Interpreter)
 if(Python3_FOUND)
-  execute_process(COMMAND ${Python3_EXECUTABLE} -c "import psutil" RESULT_VARIABLE _ret)
-  if(_ret EQUAL 0)
-    set(Python_OK true)
-  else()
-    set(Python_OK false)
-  endif()
-endif()
-if(Python_OK)
   add_executable(callpython call_python_script.f90)
-  target_link_libraries(callpython osdet)
-  add_test(NAME CallPython COMMAND callpython)
-else()
-  message(STATUS "SKIP: Python test ${Python3_EXECUTABLE} ${_ret}")
+  add_test(NAME system:CallPython COMMAND callpython)
 endif()
 
 find_program(FFPLAY NAMES ffplay)
-add_executable(playsound play_sound.f90)
 if(FFPLAY)
-  add_test(NAME PlaySound COMMAND $<TARGET_FILE:playsound> ${CMAKE_CURRENT_SOURCE_DIR}/bell.aac)
-endif()
+  add_executable(playsound play_sound.f90)
+  add_test(NAME system:PlaySound COMMAND $<TARGET_FILE:playsound> ${CMAKE_CURRENT_SOURCE_DIR}/bell.aac)
+  set_tests_properties(system:PlaySound PROPERTIES TIMEOUT 15)
+endif()

system/call_python_script.f90

@@ -3,31 +3,13 @@ program call_python
 !! this technique works in general, as Fortran will crash if calling a non-existant program
 !! without exitstat= and/or cmdstat= parameter
 
-use os_detect, only: getos
-use, intrinsic:: iso_fortran_env, only: stderr=>error_unit
-
 implicit none (type, external)
 
+character(:), allocatable :: cmd
+character(*), parameter :: exe='python'
 
-integer :: ierr, istat
-character(:), allocatable :: cmd, oscmd
-character(*), parameter :: exe='python3'
-
-cmd = "import psutil; print(f'{psutil.virtual_memory().available} MB RAM free')"
-
-select case (getos())
-case('windows')
-  oscmd = 'where '//exe
-case('unix')
-  oscmd = 'which '//exe
-case default
-  error stop 'unknown os'
-end select
-
-call execute_command_line(oscmd, cmdstat=ierr, exitstat=istat)
-if (ierr/=0 .or. istat /= 0) error stop 'python not found'
+cmd = "import os; print(f'{os.cpu_count()} CPUs detected')"
 
-call execute_command_line(exe//' -c "'//cmd//'"', cmdstat=ierr, exitstat=istat)
-if (ierr/=0 .or. istat/=0) write(stderr,*) 'Python psutil not available'
+call execute_command_line(exe//' -c "'//cmd//'"')
 
-end program
+end program

system/meson.build

@@ -15,18 +15,14 @@ test('Compiler version logging', complog,
   suite: 'system',
   timeout: 15)
 
-playsound_exe = executable('playsound', 'play_sound.f90')
 if find_program('ffplay', required: false).found()
-  test('PlaySound', playsound_exe,
+  test('PlaySound',
+    executable('playsound', 'play_sound.f90'),
     args: files('bell.aac'),
     suite: 'system',
     timeout: 15)
 endif
 
-if run_command(['python', '-c', 'import psutil']).returncode() == 0
-  callpython_exe = executable('callpython', 'call_python_script.f90',
-    link_with : osdet)
-  test('call python', callpython_exe,
-    suite: 'system',
-    timeout: 10)
-endif
+test('call python',
+executable('callpython', 'call_python_script.f90'),
+suite: 'system', timeout: 15)

system/os_detect.f90

@@ -2,26 +2,19 @@ module os_detect
 
 implicit none (type, external)
 
-
 contains
 
 function getos()
-!! heuristic detection of operating system based on de factor environment variables
+!! heuristic detection of operating system based on de facto environment variables
 character(256) :: buf
 character(:), allocatable :: getos
 
 call get_environment_variable("HOME", buf)
-if (len_trim(buf) > 0) then
-  getos = "unix"
-  return
-endif
+if (len_trim(buf) > 0) getos = "unix"
 
 call get_environment_variable("USERPROFILE", buf)
-if (len_trim(buf) > 0) then
-  getos = "windows"
-  return
-endif
+if (len_trim(buf) > 0) getos = "windows"
 
 end function getos
 
-end module os_detect
+end module os_detect