26 Feb, 2016
5 commits
-
These are working correctly again, so re-enable them.
Signed-off-by: Simon Glass
Reviewed-by: Jagan Teki
Tested-by: Jagan Teki -
The awk tool can be confused by return character (ASCII 13) in its input
since it thinks there is a separate field. These can appear if the terminal
is in raw mode, perhaps due to a previous U-Boot crash with sandbox. This
is very confusing. Remove these so that the trace test passes.Signed-off-by: Simon Glass
-
When used with a device tree, sandbox now requires a 'reset' controller. Add
this to the device trees so that reset works and the tests can complete.Signed-off-by: Simon Glass
Fixes: 5010d98f (sandbox: Use the reset driver to handle reset) -
test_hush_if_test.py executes commands that require large values of
CONFIG_SYS_MAXARGS. Detect cases where the configured value is too low
and skip those tests.Ideally, this would be implemented inside console.run_command(). However,
the command passed to that function is already a completely formed string,
and determining its argument count usage would require splitting commands
at ;, handling quoting to deal with arguments containing spaces, etc. Even
passing the command as a list wouldn't solve all these issues, since we'd
still need to split commands on ; and deal with cases like "if test ..."
which consumes 0 of the argument count.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
Sending CTRL-C to QEMU's stdin aborts the process, even if stdin is being
used as a serial port (at least in the raspi2 machine with "qemu -serial
stdin"). Avoid sending CTRL-C to U-Boot to prevent it exiting.I'd originally used CTRL-C to make sure that if the character used to
abort autoboot ended up being treated as part of a command as well, it'd
abort command entry and return the prompt to a known state. However, this
is not needed, since aborting the autoboot eats the character used to do
that.Signed-off-by: Stephen Warren
Acked-by: Simon Glass
25 Feb, 2016
2 commits
-
Provide user option to skip SPL signature verification for cases where
u-boot is build with SPL support but full U-Boot is also verified
without SPL.If you want to support this feature please add env__spl_skipped = True
to your boardenv configuration file.For example Xilinx Zynq is using this feature where the same U-Boot
binary is checked with SPL and without SPL(with FSBL).Signed-off-by: Michal Simek
-
check for U-Boot SPL signature only if SPL really has a serial output.
So check if CONFIG_SPL_SERIAL_SUPPORT is active in board config.Signed-off-by: Heiko Schocher
Tested-by: Stephen Warren
Reviewed-by: Stephen Warren
16 Feb, 2016
7 commits
-
The initial boot of U-Boot happens within the context of the first test
that needs to access the U-Boot console when there is no existing
connection. This keeps all activity nestled within test execution, which
fits well into the pytest model. However, this mingles the U-Boot startup
logs with the execution of some test(s), which hides find the boundary
between the two.To solve this, wrap the "Starting U-Boot" logic into a separate log
section. If the user wishes, they can simply collapse this log section
when viewing the HTML log, to concentrate purely on the test's own
interaction.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
u_boot_console.exec_attach.get_spawn() performs two steps:
1) Spawn a process to communicate with the serial console.
2) Reset the board so that U-Boot starts running from scratch.Currently, if an exception happens in step (2), no cleanup is performed on
the process created in step (1). That process stays running and may e.g.
hold serial port locks, or simply continue to read data from the serial
port, thus preventing it from reaching any other process that attempts to
read from the same serial port later. While there is error cleanup code in
u_boot_console_base.ensure_spawned(), this is not triggered since the
exception prevents assignment to self.p there, and hence the exception
handler has no object to operate upon in cleanup_spawn().Solve this by enhancing u_boot_console.exec_attach.get_spawn() to clean
up any objects it has created.In theory, u_boot_spawn.Spawn's constructor has a similar issue, so fix
this too.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
Use lists rather than sets to record the status of tests. This causes
the test summary in the HTML file to be generated in the same order as
the tests are (or would have been) run. This makes it easier to locate
the first failed test. The log for this test might have interesting
first clues re: interaction with the environment (e.g. hardware flashing,
serial console, ...) and may help tracking down external issues.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
The Python ini file parser that's used to parse .config converts all keys
to lower-case. Hence, all queries against the results must use lower-case.
Fix u_boot_console.ensure_spawned() to test CONFIG_SPL correctly, or the
connection will fail for boards that have SPL.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
The code replaced pexpect with custom code long ago. Don't import the
unused module so it doesn't need to be installed.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
Add documentation describing the new --gdbserver feature, and some common
pytest options.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
Invoke each "ut"-based unit test as a separate pytest.
Now that the DM unit test runs under test/py, remove the manual shell
script that invokes it.Signed-off-by: Stephen Warren
Acked-by: Simon Glass
Tested-by: Simon Glass # v2, on sandbox
10 Feb, 2016
4 commits
-
The existing regex simply ensures that the captured version string doesn't
go past the end of a line. We really want to grab as much as possible. Do
this by explicitly including a ) character at the end of the regex to
match the last character of the version test.Signed-off-by: Stephen Warren
-
A regex match object's .end() value is already the index after the match,
not the index of the last character in the match, so there's no need to
add 1 to point past the match.Signed-off-by: Stephen Warren
-
Implement three improvements to the HTML log file:
- Ability to expand/contract sections. All passing sections are contracted
at file load time so the user can concentrate on issues requiring
action.
- The overall status report is copied to the top of the log for easy
access.
- Add links from the status report to the test logs, for easy navigation.This all relies on Javascript and the jquery library. If the user doesn't
have Javascript enabled, or jquery can't be downloaded, the log should
look and behave identically to how it did before this patch.A few notes on the diff:
- A few more 'with log.section("xxx")' were added, so that all stream
blocks are kept within a section block for consistent HTML entity
nesting structure. This changed indentation in a few places, making
the diff look slightly larger.
- HTML entity IDs are cleaned up. We assign simple incrementing integer
IDs now, rather than using mangled test names which were possibly
invalid.
- Sections and streams now use common CSS class names (in addition to the
current separate class names) to more easily share the new behaviour.
This also reduces the CSS file size since rules don't need to be
duplicated.
- An "OK" status is logged after some external command executions so that
make and flash steps are auto-contracted at log file load time, assuming
they passed.Signed-off-by: Stephen Warren
-
The test/py/test.py wrapper script catches exceptions thrown when
exec()ing py.test in order to print a helpful error message. However,
the exception handling code squashes the exception and so the script
exits with a non-zero exit code, leading callers to believe that it
passed. Fix this.Signed-off-by: Stephen Warren
08 Feb, 2016
1 commit
-
Implement command--line option --gdbserver COMM, which does two things:
a) Run the sandbox process under gdbserver, using COMM as gdbserver's
communication channel.b) Disables all timeouts, so that if U-Boot is halted under the debugger,
tests don't fail. If the user gives up in the middle of a debugging
session, they can simply CTRL-C the test script to abort it.This allows easy debugging of test failures without having to manually
re-create the failure conditions. Usage is:Window 1:
./test/py/test.py --bd sandbox --gdbserver localhost:1234Window 2:
gdb ./build-sandbox/u-boot -ex 'target remote localhost:1234'When using this option, it likely makes sense to use pytest's -k option
to limit the set of tests that are executed.Simply running U-Boot directly under gdb (rather than gdbserver) was
also considered. However, this was rejected because:a) gdb's output would then be processed by the test script, and likely
confuse it causing false failures.b) pytest by default hides stdout from tests, which would prevent the
user from interacting with gdb.While gdb can be told to redirect the debugee's stdio to a separate
PTY, this would appear to leave gdb's stdio directed at the test
scripts and the debugee's stdio directed elsewhere, which is the
opposite of the desired effect. Perhaps some complicated PTY muxing
and process hierarchy could invert this. However, the current scheme
is simple to implement and use, so it doesn't seem worth complicating
matters.c) Using gdbserver allows arbitrary debuggers to be used, even those with
a GUI. If the test scripts invoked the debugger themselves, they'd have
to know how to execute arbitary applications. While the user could hide
this all in a wrapper script, this feels like extra complication.An interesting future idea might be a --gdb-screen option, which could
spawn both U-Boot and gdb separately, and spawn the screen into a newly
created window under screen. Similar options could be envisaged for
creating a new xterm/... too.--gdbserver currently only supports sandbox, and not real hardware.
That's primarily because the test hooks are responsible for all aspects of
hardware control, so there's nothing for the test scripts themselves can
do to enable gdbserver on real hardware. We might consider introducing a
separate --disable-timeouts option to support use of debuggers on real
hardware, and having --gdbserver imply that option.Signed-off-by: Stephen Warren
06 Feb, 2016
1 commit
-
Close the file earlier to hopefully fix a Coverity error.
Reported-by: Coverity (CID: 134901)
Signed-off-by: Simon Glass
Reviewed-by: Tom Rini
30 Jan, 2016
4 commits
-
This adds tests for the different character types, line wrap, scrolling and
backspace.Signed-off-by: Simon Glass
-
Enable this feature so that truetype fonts can be used on the sandbox
console. Update the tests to select the normal/rotated console when needed.Signed-off-by: Simon Glass
Signed-off-by: Anatolij Gustschin -
This can be sent when to many characters are entered. Make sure it is
ignored and does not cause a character to be displayed.Signed-off-by: Simon Glass
-
With anti-aliased fonts we need a more fine-grained horizontal position
than a single pixel. Characters can be positioned to start part-way through
a pixel, with anti-aliasing (greyscale edges) taking care of the visual
effect.To cope with this, use fractional units (1/256 pixel) for horizontal
positions in the text console.Signed-off-by: Simon Glass
[agust: rebased]
Signed-off-by: Anatolij Gustschin
29 Jan, 2016
16 commits
-
Allow the env__dfu_configs boardenv data to specify the set of DFU
transfer sizes to test. Manually specifying test sizes is useful if you
wish to test multiple DFU configurations (e.g. SD card ext4 filesystem, SD
card whole raw partition, RAM, etc.), but don't want to test every
single transfer size on each, to avoid bloating the overall time taken by
testing. If the boardenv doesn't specify a set of sizes, the built-in list
is used as a default, preserving backwards-compatibility.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
s/updata/update/.
Signed-off-by: Stephen Warren
Reviewed-by: Simon Glass -
Some unit tests expect the cwd of the sandbox process to be the root
of the source tree. Ensure that requirement is met.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
This is required for at least "ut dm" to operate correctly.
Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
Tests can complete in passed, skipped, xpass, xfailed, or failed, states.
Currently the U-Boot log generation code doesn't handle the xfailed or
xpass states since they aren't used. Add support for the remaining states.
Without this, tests that xfail end up being reported as skipped.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
Many error situations in U-Boot print the message:
### ERROR ### Please RESET the board ###Add this to the list of bad patterns the test system detects. One
practical advantage of this change is to detect the case where sandbox
is told to use a particular DTB file, and the file cannot be opened.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
Currently, bad patterns are only honored when executing a shell command.
Other cases, such as the initial boot-up of U-Boot or when interacting
with command output rather than gathering all output prior to the shell
prompt, do not currently look for bad patterns in console output. This
patch makes sure that bad patterns are honored everywhere.One benefit of this change is that if U-Boot sandbox fails to start up,
the error message it emits can be caught immediately, rather than relying
on a (long) timeout when waiting for the expected signon message and/or
command prompt.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
A future patch will use the bad_patterns array in multiple places. Rather
than duplicating the code to calculate it, or even sharing it in a
function and simply calling it redundantly when nothing has changed, only
re-calculate the list when some change is made to it. This reduces work.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
Multiple patterns may be passed to spawn.expect(). The pattern which
matches at the earliest position should be designated as the match. This
aspect works correctly. When multiple patterns match at the same position,
priority should be given the the earliest entry in the list of patterns.
This aspect does not work correctly. This patch fixes it.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
The ut command prints a test failure count each time it is executed.
This is stored in a global variable which is never reset. Consequently,
the printed failure count accumulates across runs. Fix this by clearing
the counter each time "ut" is invoked.Signed-off-by: Stephen Warren
Acked-by: Simon Glass -
When pytest generates the name for parametrized tests, simple parameter
values (ints, strings) get used directly, but more complex values such
as dicts are not handled. This yields test names such as:dfu[env__usb_dev_port0-env__dfu_config0]
dfu[env__usb_dev_port0-env__dfu_config1]Add some code to extract a custom fixture ID from the fixture values, so
that we end up with meaningful names such as:dfu[micro_b-emmc]
dfu[devport2-ram]If the boardenv file doesn't define custom names, the code falls back to
the old algorithm.Signed-off-by: Stephen Warren
Reviewed-by: Simon Glass -
When converting test/py from " to ', I missed a few places (or added a
few inconsistencies later). Fix these.Note that only quotes in code are converted; double-quotes in comments
and HTML are left as-is, since English and HTML use " not '.Signed-off-by: Stephen Warren
Reviewed-by: Simon Glass -
Python's coding style docs indicate to use " not ' for docstrings.
test/py has other violations of the coding style docs, since the docs
specify a stranger style than I would expect, but nobody has complained
about those yet:-)Signed-off-by: Stephen Warren
Reviewed-by: Simon Glass -
The existing net test executes a list of commands supplied by boardenv
variable env__net_pre_commands. The idea was that boardenv would know
whether the Ethernet device was attached to USB, PCI, ... and hence was
the best place to put any commands required to probe the device.However, this approach doesn't scale well when attempting to use a single
boardenv across multiple branches of U-Boot, some of which require "pci
enum" to enumerate PCI and others of which don't, or don't /yet/ simply
because various upstream changes haven't been merged down.This patch updates the test to require that the boardenv state which HW
features are required for Ethernet to work, and lets the test itself map
that knowledge to the set of commands to execute. Since this mapping is
part of the test script, which is part of the U-Boot code/branch, this
approach is more scalable. It also feels cleaner, since again boardenv
is only providing data, rather than test logic.Signed-off-by: Stephen Warren
Reviewed-by: Simon Glass -
The DFU test requests U-Boot configure its USB controller in device mode,
then waits for the host machine to enumerate the USB device and create a
device node for it. However, this wait can be fooled if the USB device
node already exists before the test starts, e.g. if some previous software
stack already configured the USB controller into device mode and never
de-configured it. This "previous software stack" could even be another
test/py test, if U-Boot's own USB teardown does not operate correctly. If
this happens, dfu-util may be run before U-Boot is ready to serve DFU
commands, which may cause false test failures.Enhance the dfu test to fail if the device node exists before it is
expected to.Signed-off-by: Stephen Warren
Reviewed-by: Simon Glass -
test/py contains logic to detect the target crashing and rebooting by
searching the console output for a U-Boot signon message, which will
presumably be emitted when the system boots after the crash/reset.Currently, this logic only searches for the exact signon message that
was printed by the U-Boot version under test, upon the assumption that
binary is written into flash, and hence will be the version booted after
any reset. However, this is not a valid assumption; some test setups
download the U-Boot-under-test into RAM and boot it from there, and in
such a scenario an arbitrary U-Boot version may be located in flash and
hence run after any reset.Fix the reset detection logic to match any U-Boot signon message. This
prevents false negatives.Signed-off-by: Stephen Warren
Acked-by: Simon Glass