diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/README | 6 | ||||
-rw-r--r-- | tests/esp32/partition_ota.py | 2 | ||||
-rw-r--r-- | tests/feature_check/README | 2 | ||||
-rw-r--r-- | tests/jni/README | 2 | ||||
-rw-r--r-- | tests/net_hosted/README | 2 | ||||
-rw-r--r-- | tests/net_inet/README | 2 | ||||
-rwxr-xr-x | tests/run-internalbench.py | 2 | ||||
-rw-r--r-- | tests/run-tests-exp.py | 4 | ||||
-rwxr-xr-x | tests/run-tests-exp.sh | 4 | ||||
-rwxr-xr-x | tests/run-tests.py (renamed from tests/run-tests) | 12 |
10 files changed, 19 insertions, 19 deletions
diff --git a/tests/README b/tests/README index f2cd89bb93..8794202e15 100644 --- a/tests/README +++ b/tests/README @@ -1,15 +1,15 @@ This directory contains tests for various functionality areas of MicroPython. -To run all stable tests, run "run-tests" script in this directory. +To run all stable tests, run "run-tests.py" script in this directory. Tests of capabilities not supported on all platforms should be written to check for the capability being present. If it is not, the test should merely output 'SKIP' followed by the line terminator, and call sys.exit() to raise SystemExit, instead of attempting to test the -missing capability. The testing framework (run-tests in this +missing capability. The testing framework (run-tests.py in this directory, test_main.c in qemu_arm) recognizes this as a skipped test. There are a few features for which this mechanism cannot be used to -condition a test. The run-tests script uses small scripts in the +condition a test. The run-tests.py script uses small scripts in the feature_check directory to check whether each such feature is present, and skips the relevant tests if not. diff --git a/tests/esp32/partition_ota.py b/tests/esp32/partition_ota.py index 765630c8ce..212fcf0338 100644 --- a/tests/esp32/partition_ota.py +++ b/tests/esp32/partition_ota.py @@ -95,7 +95,7 @@ def copy_partition(src, dest): if sz - addr < 4096: blk = blk[: sz - addr] if addr & 0xFFFF == 0: - # need to show progress to run-tests else it times out + # need to show progress to run-tests.py else it times out print(" ... 0x{:06x}".format(addr)) src.readblocks(addr >> 12, blk) dest.writeblocks(addr >> 12, blk) diff --git a/tests/feature_check/README b/tests/feature_check/README index d062020f7b..3b7b6cba41 100644 --- a/tests/feature_check/README +++ b/tests/feature_check/README @@ -1,4 +1,4 @@ This directory doesn't contain real tests, but code snippets to detect various interpreter features, which can't be/inconvenient to detecte by -other means. Scripts here are executed by run-tests at the beginning of +other means. Scripts here are executed by run-tests.py at the beginning of testsuite to decide what other test groups to run/exclude. diff --git a/tests/jni/README b/tests/jni/README index 8418bb84f4..f1e1b0eca0 100644 --- a/tests/jni/README +++ b/tests/jni/README @@ -8,5 +8,5 @@ of JVM. For example, for OpenJDK 7 on x86_64, following may work: -LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server ./run-tests jni/*.py +LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server ./run-tests.py jni/*.py diff --git a/tests/net_hosted/README b/tests/net_hosted/README index 724dd61584..709ed50ce3 100644 --- a/tests/net_hosted/README +++ b/tests/net_hosted/README @@ -8,4 +8,4 @@ not yet fully correspond to the functional specification above. So far, these tests are not run as part of the main testsuite and need to be run seperately (from the main test/ directory): - ./run-tests net_hosted/*.py + ./run-tests.py net_hosted/*.py diff --git a/tests/net_inet/README b/tests/net_inet/README index 9a5614efa6..1d6e15b174 100644 --- a/tests/net_inet/README +++ b/tests/net_inet/README @@ -2,4 +2,4 @@ This directory contains network tests which require Internet connection. Note that these tests are not run as part of the main testsuite and need to be run seperately (from the main test/ directory): - ./run-tests net_inet/*.py + ./run-tests.py net_inet/*.py diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py index 63392814a8..606fc3b772 100755 --- a/tests/run-internalbench.py +++ b/tests/run-internalbench.py @@ -67,7 +67,7 @@ def main(): cmd_parser.add_argument("files", nargs="*", help="input test files") args = cmd_parser.parse_args() - # Note pyboard support is copied over from run-tests, not testes, and likely needs revamping + # Note pyboard support is copied over from run-tests.py, not tests, and likely needs revamping if args.pyboard: import pyboard diff --git a/tests/run-tests-exp.py b/tests/run-tests-exp.py index ac32fe9869..21b6645336 100644 --- a/tests/run-tests-exp.py +++ b/tests/run-tests-exp.py @@ -1,6 +1,6 @@ # -# This is minimal MicroPython variant of run-tests script, which uses -# .exp files as generated by run-tests --write-exp. It is useful to run +# This is minimal MicroPython variant of run-tests.py script, which uses +# .exp files as generated by run-tests.py --write-exp. It is useful to run # testsuite on systems which have neither CPython3 nor unix shell. # This script is intended to be run by the same interpreter executable # which is to be tested, so should use minimal language functionality. diff --git a/tests/run-tests-exp.sh b/tests/run-tests-exp.sh index 8f81b96d2f..177090cd8d 100755 --- a/tests/run-tests-exp.sh +++ b/tests/run-tests-exp.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# This is plain shell variant of run-tests script, which uses .exp files -# as generated by run-tests --write-exp. It is useful to run testsuite +# This is plain shell variant of run-tests.py script, which uses .exp files +# as generated by run-tests.py --write-exp. It is useful to run testsuite # on embedded systems which don't have CPython3. # diff --git a/tests/run-tests b/tests/run-tests.py index b733d8a9fc..5863b23b41 100755 --- a/tests/run-tests +++ b/tests/run-tests.py @@ -258,7 +258,7 @@ def run_tests(pyb, tests, args, result_dir): if not (args.list_tests or args.write_exp): # Even if we run completely different tests in a different directory, # we need to access feature_checks from the same directory as the - # run-tests script itself so use base_path. + # run-tests.py script itself so use base_path. # Check if micropython.native is supported, and skip such tests if it's not output = run_feature_check(pyb, args, base_path, 'native_check.py') @@ -582,19 +582,19 @@ Tests are discovered by scanning test directories for .py files or using the specified test files. If test files nor directories are specified, the script expects to be ran in the tests directory (where this file is located) and the builtin tests suitable for the target platform are ran. -When running tests, run-tests compares the MicroPython output of the test with the output +When running tests, run-tests.py compares the MicroPython output of the test with the output produced by running the test through CPython unless a <test>.exp file is found, in which case it is used as comparison. -If a test fails, run-tests produces a pair of <test>.out and <test>.exp files in the result +If a test fails, run-tests.py produces a pair of <test>.out and <test>.exp files in the result directory with the MicroPython output and the expectations, respectively. ''', epilog='''\ Options -i and -e can be multiple and processed in the order given. Regex "search" (vs "match") operation is used. An action (include/exclude) of the last matching regex is used: - run-tests -i async - exclude all, then include tests containing "async" anywhere - run-tests -e '/big.+int' - include all, then exclude by regex - run-tests -e async -i async_foo - include all, exclude async, yet still include async_foo + run-tests.py -i async - exclude all, then include tests containing "async" anywhere + run-tests.py -e '/big.+int' - include all, then exclude by regex + run-tests.py -e async -i async_foo - include all, exclude async, yet still include async_foo ''') cmd_parser.add_argument('--target', default='unix', help='the target platform') cmd_parser.add_argument('--device', default='/dev/ttyACM0', help='the serial device or the IP address of the pyboard') |