From c50e983a026f847da0d97e8819be99cd99ab1a17 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 26 Jul 2012 08:54:59 -0700 Subject: [PATCH] Run only selenium tests with run-selenium.sh. Previously run-selenium.sh ran all of the projects unit tests. This was redundant as other tests capture the results of the other unit tests. Run only the selenium tests to prevent duplicated effort. Also output Xunit results. Change-Id: Ic1f3ba8575f923dfa8f121a3deafdeb41f13bd00 --- modules/jenkins_slave/files/slave_scripts/run-selenium.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/jenkins_slave/files/slave_scripts/run-selenium.sh b/modules/jenkins_slave/files/slave_scripts/run-selenium.sh index 7bd248c2b6..08993236b1 100755 --- a/modules/jenkins_slave/files/slave_scripts/run-selenium.sh +++ b/modules/jenkins_slave/files/slave_scripts/run-selenium.sh @@ -14,7 +14,8 @@ DIMENSIONS='1280x1024x24' /usr/bin/Xvfb :${VDISPLAY} -screen 0 ${DIMENSIONS} 2>&1 > /dev/null & set +e -DISPLAY=:${VDISPLAY} tox -e$venv -- /bin/bash run_tests.sh -N --with-selenium +DISPLAY=:${VDISPLAY} NOSE_WITH_XUNIT=1 tox -e$venv -- \ + /bin/bash run_tests.sh -N --only-selenium result=$? pkill Xvfb 2>&1 > /dev/null