From b7e39fd0cc62abcb68238eb4a730b9edc3fa07f5 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 27 Feb 2018 00:24:49 -0600
Subject: [PATCH] Fix pytest script-based test invocation
---
test/test_apps.py | 2 +-
test/test_c_execution.py | 2 +-
test/test_dg.py | 2 +-
test/test_diff.py | 2 +-
test/test_domain.py | 2 +-
test/test_fortran.py | 2 +-
test/test_isl.py | 2 +-
test/test_linalg.py | 2 +-
test/test_loopy.py | 2 +-
test/test_misc.py | 2 +-
test/test_nbody.py | 2 +-
test/test_numa_diff.py | 2 +-
test/test_reduction.py | 2 +-
test/test_scan.py | 2 +-
test/test_sem_reagan.py | 2 +-
test/test_statistics.py | 2 +-
test/test_target.py | 2 +-
test/test_transform.py | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/test/test_apps.py b/test/test_apps.py
index 12b59e18a..0ed3162f1 100644
--- a/test/test_apps.py
+++ b/test/test_apps.py
@@ -671,7 +671,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_c_execution.py b/test/test_c_execution.py
index 975227b43..01a2cb94f 100644
--- a/test/test_c_execution.py
+++ b/test/test_c_execution.py
@@ -347,7 +347,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_dg.py b/test/test_dg.py
index e96c76d88..c8623f78d 100644
--- a/test/test_dg.py
+++ b/test/test_dg.py
@@ -246,5 +246,5 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
diff --git a/test/test_diff.py b/test/test_diff.py
index 3d19721ac..054d81f52 100644
--- a/test/test_diff.py
+++ b/test/test_diff.py
@@ -106,7 +106,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_domain.py b/test/test_domain.py
index 680ff2992..20614d510 100644
--- a/test/test_domain.py
+++ b/test/test_domain.py
@@ -406,7 +406,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_fortran.py b/test/test_fortran.py
index ea2f68b61..a876e2b49 100644
--- a/test/test_fortran.py
+++ b/test/test_fortran.py
@@ -498,7 +498,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_isl.py b/test/test_isl.py
index f793b1fa9..bbd4a813e 100644
--- a/test/test_isl.py
+++ b/test/test_isl.py
@@ -56,5 +56,5 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
diff --git a/test/test_linalg.py b/test/test_linalg.py
index accdebc12..7db6c390f 100644
--- a/test/test_linalg.py
+++ b/test/test_linalg.py
@@ -643,5 +643,5 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
diff --git a/test/test_loopy.py b/test/test_loopy.py
index 86351dd93..ef1f491d2 100644
--- a/test/test_loopy.py
+++ b/test/test_loopy.py
@@ -2873,7 +2873,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_misc.py b/test/test_misc.py
index ec14770a9..c67c66405 100644
--- a/test/test_misc.py
+++ b/test/test_misc.py
@@ -291,7 +291,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_nbody.py b/test/test_nbody.py
index f2a8fc198..d1a708f72 100644
--- a/test/test_nbody.py
+++ b/test/test_nbody.py
@@ -102,5 +102,5 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
diff --git a/test/test_numa_diff.py b/test/test_numa_diff.py
index 216f7f637..7479b849b 100644
--- a/test/test_numa_diff.py
+++ b/test/test_numa_diff.py
@@ -258,7 +258,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_reduction.py b/test/test_reduction.py
index 6b62bad5b..866ae9f58 100644
--- a/test/test_reduction.py
+++ b/test/test_reduction.py
@@ -442,7 +442,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_scan.py b/test/test_scan.py
index 44903611d..c45afd0d6 100644
--- a/test/test_scan.py
+++ b/test/test_scan.py
@@ -429,7 +429,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_sem_reagan.py b/test/test_sem_reagan.py
index ecb2352ae..450ddeba9 100644
--- a/test/test_sem_reagan.py
+++ b/test/test_sem_reagan.py
@@ -115,5 +115,5 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
diff --git a/test/test_statistics.py b/test/test_statistics.py
index c04257ff8..ea0bdb62b 100644
--- a/test/test_statistics.py
+++ b/test/test_statistics.py
@@ -1095,5 +1095,5 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
diff --git a/test/test_target.py b/test/test_target.py
index 15964987a..89d72c0ac 100644
--- a/test/test_target.py
+++ b/test/test_target.py
@@ -331,7 +331,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
diff --git a/test/test_transform.py b/test/test_transform.py
index e1a58e302..2f98fe34d 100644
--- a/test/test_transform.py
+++ b/test/test_transform.py
@@ -537,7 +537,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1:
exec(sys.argv[1])
else:
- from py.test.cmdline import main
+ from pytest import main
main([__file__])
# vim: foldmethod=marker
--
GitLab