From 9f1df358419b739a2c90cc32366c3990f3fcc30e Mon Sep 17 00:00:00 2001 From: Remzi Arpaci-Dusseau Date: Sun, 31 Mar 2019 12:14:37 -0500 Subject: [PATCH] rename expect script to use proper file extension; fix other things as needed --- initial-xv6/tests/1.run | 2 +- initial-xv6/tests/2.run | 2 +- tester/README.md | 5 +++-- tester/{run-xv6-command.sh => run-xv6-command.exp} | 0 4 files changed, 5 insertions(+), 4 deletions(-) rename tester/{run-xv6-command.sh => run-xv6-command.exp} (100%) diff --git a/initial-xv6/tests/1.run b/initial-xv6/tests/1.run index 7b9fd24..9eda241 100644 --- a/initial-xv6/tests/1.run +++ b/initial-xv6/tests/1.run @@ -1 +1 @@ -cd src; ../../tester/run-xv6-command.sh CPUS=1 Makefile.test test_1 | grep XV6_TEST_OUTPUT; cd .. +cd src; ../../tester/run-xv6-command.exp CPUS=1 Makefile.test test_1 | grep XV6_TEST_OUTPUT; cd .. diff --git a/initial-xv6/tests/2.run b/initial-xv6/tests/2.run index b83d0be..41804a2 100644 --- a/initial-xv6/tests/2.run +++ b/initial-xv6/tests/2.run @@ -1 +1 @@ -cd src; ../../tester/run-xv6-command.sh CPUS=2 Makefile.test test_2 | grep XV6_TEST_OUTPUT; cd .. +cd src; ../../tester/run-xv6-command.exp CPUS=2 Makefile.test test_2 | grep XV6_TEST_OUTPUT; cd .. diff --git a/tester/README.md b/tester/README.md index 069bced..6aa0008 100644 --- a/tester/README.md +++ b/tester/README.md @@ -37,8 +37,9 @@ The options for `run-tests.sh` include: * `-s` (suppress running the one-time set of commands in `pre` file) There is also another script used in testing of `xv6` projects, called -`run-xv6-command`. This is an `expect` script which launches the qemu -emulator and runs the relevant testing command in the xv6 environment +`run-xv6-command.exp`. This is an +[`expect`](https://en.wikipedia.org/wiki/Expect) script which launches the +qemu emulator and runs the relevant testing command in the xv6 environment before automatically terminating the test. It is used by the `run-tests.sh` script as described above and thus not generally called by users directly. diff --git a/tester/run-xv6-command.sh b/tester/run-xv6-command.exp similarity index 100% rename from tester/run-xv6-command.sh rename to tester/run-xv6-command.exp