diff options
| author | Dimitrios Apostolou <jimis@qt.io> | 2022-01-13 13:28:55 +0100 |
|---|---|---|
| committer | Dimitrios Apostolou <jimis@qt.io> | 2022-02-14 12:56:06 +0100 |
| commit | c37d0e84bc4e6bc9840190eaf73f5a39fbfa0b1d (patch) | |
| tree | 5ff005559f9d64c67540d897da437d5a438e2130 /util | |
| parent | d6c4a3edf9adb02b6f96d43768db9f90a6623de7 (diff) | |
Clean up QNX platform configs and improve testrunner scripts
QNX requires its own TESTRUNNER script in order to SSH to the QEMU guest
and run the tests. Simplify it a lot and fix the way it passes arguments
so that they retain spaces and quotation.
Also wrap it with the generic TESTRUNNER script for CI, which is
qt-testrunner.py, so that tests can re-run in case of flakiness.
Delete prefix.sh as the environment variables are now properly set in
the Coin platform config files.
Avoid executing extra chmod commands to make scripts executable,
but use the right Coin instruction for that. For reference, we
use 493 for file mode which equals to 755 in octal, as Coin expects
the file mode in decimal.
Change-Id: Ife4d1caef606f48b92ba1da1cfb14ec0dea11ef2
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/testrunner/qt-testrunner.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/util/testrunner/qt-testrunner.py b/util/testrunner/qt-testrunner.py index 20ef2ccbb7..8a9b469977 100755 --- a/util/testrunner/qt-testrunner.py +++ b/util/testrunner/qt-testrunner.py @@ -157,9 +157,16 @@ Default flags: --max-repeats 5 --passes-needed 1 args.log_dir = "." args.test_basename = os.path.basename(args.testargs[0]) + if args.test_basename.endswith(".exe"): args.test_basename = args.test_basename[:-4] + # QNX test wrapper just needs to be skipped to figure out test_basename + if args.test_basename == "coin_qnx_qemu_runner.sh": + args.test_basename = os.path.basename(args.testargs[1]) + L.info("Detected coin_qnx_qemu_runner, test will be handled specially. Detected test basename: %s", + args.test_basename) + # On Android emulated platforms, "androidtestrunner" is invoked by CMake # to wrap the tests. We have to append the test arguments to it after # "--". Besides that we have to detect the basename to avoid saving the |