| commit | bbe2ee9bf3f4e2670d324883484fb957a1808228 | [log] [tgz] |
|---|---|---|
| author | Simon Butcher <simon.butcher@arm.com> | Tue Apr 05 14:09:12 2016 +0100 |
| committer | Simon Butcher <simon.butcher@arm.com> | Tue Apr 05 14:09:12 2016 +0100 |
| tree | 21d0bb3f0ab3594ad08aeff75dc19ec6f04cb36f | |
| parent | d9106f3538d1e6aca681f3904adae41ab4809947 [diff] | |
| parent | 4c5dccf419604715fcddc0b214e18cbc475ea822 [diff] |
Resolves conflicts in basic-build-test.sh
diff --git a/tests/scripts/basic-build-test.sh b/tests/scripts/basic-build-test.sh index ffca6f9..f1b36c3 100755 --- a/tests/scripts/basic-build-test.sh +++ b/tests/scripts/basic-build-test.sh
@@ -37,7 +37,8 @@ # Step 1 - Make and instrumented build for code coverage export CFLAGS=' --coverage -g3 -O0 ' -make clean; make +make clean +make # Step 2 - Execute the tests