diff options
| author | Gaurav Shah <gauravsh@google.com> | 2010-02-16 19:04:11 -0800 |
|---|---|---|
| committer | Gaurav Shah <gauravsh@google.com> | 2010-02-16 19:04:11 -0800 |
| commit | 7ca31f3e4d21bb7dfa39e1e4b9ab42c7047e66d8 (patch) | |
| tree | 4e6a101231e65a7cdb1d33b15c72c9ea3105c6e7 /tests | |
| parent | 431b98886ed80b46e404d7288362f8dcdfa9ace3 (diff) | |
| download | vboot-7ca31f3e4d21bb7dfa39e1e4b9ab42c7047e66d8.tar.gz | |
Vboot Reference: Misc style fixes to Makefile and fix testing script.
Review URL: http://codereview.chromium.org/600114
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 4 | ||||
| -rwxr-xr-x | tests/run_rsa_tests.sh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/Makefile b/tests/Makefile index 4801dc5b..5d4faf98 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -3,7 +3,7 @@ # found in the LICENSE file. CC ?= gcc -CFLAGS = -Wall +CFLAGS = -Wall -DNDEBUG INCLUDES ?= -I../include/ TOP ?= ../ @@ -19,7 +19,7 @@ firmware_image_tests: firmware_image_tests.c $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) sha_benchmark: sha_benchmark.c timer_utils.c - $(CC) $(CFLAGS) -DNDEBUG $(INCLUDES) $^ -o $@ $(LIBS) + $(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS) clean: rm -f sha_tests sha_benchmark firmware_image_tests diff --git a/tests/run_rsa_tests.sh b/tests/run_rsa_tests.sh index d56f5a08..20384836 100755 --- a/tests/run_rsa_tests.sh +++ b/tests/run_rsa_tests.sh @@ -72,7 +72,7 @@ function pre_work { } function cleanup { - rm ${TEST_FILE} ${TEST_FILE}.*.sig + rm ${SCRIPT_DIR}/${TEST_FILE} ${SCRIPT_DIR}/${TEST_FILE}.*.sig } # Determine script directory. @@ -87,6 +87,7 @@ else fi UTIL_DIR=`dirname ${SCRIPT_DIR}`/utils KEY_DIR=${SCRIPT_DIR}/testkeys +TEST_DIR=${SCRIPT_DIR}/ echo "Generating test cases..." pre_work @@ -101,7 +102,7 @@ test_verification echo echo "Cleaning up..." -#cleanup +cleanup exit $return_code |