simplify/correct test logic

before this, tests were being skipped on Ubuntu 20.04 with Anaconda Python
Now, all 5 tests success

1 files changed, 18 insertions, 17 deletions

diff --git a/test cases/python/4 custom target depends extmodule/meson.build b/test cases/python/4 custom target depends extmodule/meson.build
index ccccdafbe..d8a62ed25 100644
--- a/test cases/python/4 custom target depends extmodule/meson.build
+++ b/test cases/python/4 custom target depends extmodule/meson.build
@@ -12,6 +12,10 @@ py3 = py_mod.find_installation()
 py3_dep = py3.dependency(required : false)
 cc = meson.get_compiler('c')
 
+if not py3_dep.found()
+  error('MESON_SKIP_TEST: Python3 libraries not found, skipping test.')
+endif
+
 # Copy to the builddir so that blaster.py can find the built tachyon module
 # FIXME: We should automatically detect this case and append the correct paths
 # to PYTHONLIBDIR
@@ -24,21 +28,18 @@ import os, sys
 with open(sys.argv[1], 'rb') as f:
   assert(f.read() == b'success')
 '''
-if py3_dep.found()
-  message('Detected Python version: ' + py3_dep.version())
-  if py3_dep.version().version_compare('>=3.8') and cc.get_id() == 'msvc' and cc.version().version_compare('<=19.00.24215.1')
-    error('MESON_SKIP_TEST: Python modules do not work with Python 3.8 and VS2015 or earlier.')
-  endif
-  subdir('ext')
-
-  out_txt = custom_target('tachyon flux',
-    input : blaster_py,
-    output : 'out.txt',
-    command : [py3, '@INPUT@', '-o', '@OUTPUT@'],
-    depends : pylib,
-    build_by_default: true)
-
-  test('flux', py3, args : ['-c', check_exists, out_txt])
-else
-  error('MESON_SKIP_TEST: Python3 libraries not found, skipping test.')
+
+message('Detected Python version: ' + py3_dep.version())
+if py3_dep.version().version_compare('>=3.8') and cc.get_id() == 'msvc' and cc.version().version_compare('<=19.00.24215.1')
+  error('MESON_SKIP_TEST: Python modules do not work with Python 3.8 and VS2015 or earlier.')
 endif
+subdir('ext')
+
+out_txt = custom_target('tachyon flux',
+  input : blaster_py,
+  output : 'out.txt',
+  command : [py3, '@INPUT@', '-o', '@OUTPUT@'],
+  depends : pylib,
+  build_by_default: true)
+
+test('flux', py3, args : ['-c', check_exists, out_txt])