aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2009-12-14 16:18:21 +0100
committerAndi Kleen <ak@linux.intel.com>2009-12-14 16:18:21 +0100
commitef36622ae64af4088c072bb5e0a4457589c2e1a8 (patch)
treedd15a0dacfcc36b434ecec15c35259d51d9a92f9
parent8e86fde38a2c5b90a033bf0e91621a0aa4dd1a21 (diff)
downloadmce-test-ef36622ae64af4088c072bb5e0a4457589c2e1a8.tar.gz
Don't run kdump test in make test, but in make test-kdump
This essentially renames test-simple to test Also some minor fixes to the Makefiel Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r--Makefile10
-rw-r--r--doc/howto.txt7
2 files changed, 11 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 4015eab..77fc5c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+.PHONY: test clean distclean reset test-simple test-kdump
all:
$(MAKE) -C tools
@@ -20,13 +21,16 @@ reset:
rm -rf work/*
rm -rf results/*
-test:
+test: test-simple
+
+test-simple:
$(MAKE) reset
./drivers/simple/driver.sh simple.conf
- ./drivers/kdump/driver.sh kdump.conf
$(MAKE) -C tsrc test
-test-simple:
+# requires special packages to be installed
+test-kdump:
$(MAKE) reset
./drivers/simple/driver.sh simple.conf
+ ./drivers/kdump/driver.sh kdump.conf
$(MAKE) -C tsrc test
diff --git a/doc/howto.txt b/doc/howto.txt
index d7de73c..776912c 100644
--- a/doc/howto.txt
+++ b/doc/howto.txt
@@ -52,7 +52,7 @@ guide and how to add new test cases into test suite.
gcc -o page-types page-types.c
cp page-types /usr/bin/
-- Run make test-simple
+- Run make test
This will do the basic tests, but not the more complicated kdump ones.
For more information on those read below.
@@ -268,7 +268,8 @@ d. It is recommended to stop cron before testing. Because there
e. To be root and invoke simple test driver on test configuration file
as follow
- drivers/simple/driver.sh config/simple.conf
+ Run "make test" to do all the standard tests that do not require
+ special set up.
f. General test result will go results/simple/result. Test log will go
work/simple/log. Additional test results for various test cases
@@ -362,7 +363,7 @@ g. Create a new test configuration file or use a existing one in
h. Run "make". Carefully check for any errors.
-i. To be root and run "drivers/kdump/driver.sh <conf>"
+i. To be root and run "drivers/kdump/driver.sh <conf>" or "make test-kdump" (for a full test)
j. After test is done, the test log of the last run of kdump driver will
be displayed on main console.