From 4b6e99e0a7bdb4a80f764e64ae19eaa32f1244f0 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Mon, 15 Oct 2007 15:20:04 +0000
Subject: [PATCH] rebuild everything every time
SVN: 2160
---
integration-tests/build/build.xml | 1 +
integration-tests/readme.txt | 5 ++---
integration-tests/run.sh | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/integration-tests/build/build.xml b/integration-tests/build/build.xml
index 52884277ee7..946272275b5 100644
--- a/integration-tests/build/build.xml
+++ b/integration-tests/build/build.xml
@@ -4,6 +4,7 @@
<target name="integration-tests">
<exec executable="sh" dir="${basedir}" resultproperty="result-code">
<arg value="./run.sh" />
+ <arg value="--force-rebuild" />
</exec>
<fail>
<condition>
diff --git a/integration-tests/readme.txt b/integration-tests/readme.txt
index 19008119f25..399f1cb6564 100644
--- a/integration-tests/readme.txt
+++ b/integration-tests/readme.txt
@@ -22,7 +22,7 @@ Directories
Launching
-----------------
Tests are run automatically in Continuous Integration process.
-You can also run them manually. To do that, simply run ant with default target in build directory (integration-tests/build).
+You can also run them manually. To do that, simply launch run.sh from integration-tests project.
Testing is fully automatic. Script returns non-zero value if error occurs.
When testing is launched, following things happen:
- source code is fetched from the repository and is built
@@ -32,5 +32,4 @@ When testing is launched, following things happen:
Exact reason of an error can be checked by reading standard output or playground/all_err_log.txt.
Launching run.sh again will redo the tests without rebuilding or reinstaling anything.
To reinstall everything without rebuilding binaries, delete playground directory.
-If you want to starting tests from the scratch, run ant with 'clean' target before.
-
+If you want to starting tests from the scratch, launch run.sh with --force-rebuild option.
diff --git a/integration-tests/run.sh b/integration-tests/run.sh
index f1fbb9e5aa0..1d4f1efa8a7 100755
--- a/integration-tests/run.sh
+++ b/integration-tests/run.sh
@@ -393,5 +393,10 @@ function clean_after_tests {
if [ "$1" = "clean" ]; then
clean_after_tests
else
- integration_tests false false
+ force_rebuild=false
+ force_reinstall=false
+ if [ "$1" = "--force-rebuild" ]; then
+ force_rebuild=true
+ fi
+ integration_tests $force_rebuild $force_reinstall
fi
\ No newline at end of file
--
GitLab