aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Mailänder2014-05-30 04:09:47 (EDT)
committerMatthias Mailänder2014-07-27 01:59:58 (EDT)
commit164a895b467feedc21dc161cac22ab6f6e6832c2 (patch)
treebd57efaa589ddc2a453dc3afd7d2b1b39f439d43
parent2ed8e9c33ce00f9e4eb6e7971948e9c67bd31e3f (diff)
downloadeclipse.platform.releng.aggregator-164a895b467feedc21dc161cac22ab6f6e6832c2.zip
eclipse.platform.releng.aggregator-164a895b467feedc21dc161cac22ab6f6e6832c2.tar.gz
eclipse.platform.releng.aggregator-164a895b467feedc21dc161cac22ab6f6e6832c2.tar.bz2
Bug 436197 - Don't try to start GNOME metacity window manager on KDErefs/changes/51/30551/1
when doing automated performance tests Change-Id: I17e5a3217bc13e1a1d242937d9453052c579d5c9 Signed-off-by: Matthias Mailänder <matthias.mailaender@vogella.com>
-rwxr-xr-xeclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh6
-rw-r--r--production/testScripts/configuration/sdk.tests/testScripts/runtests.sh6
2 files changed, 6 insertions, 6 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh
index 9046e44..d57710b 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh
@@ -111,8 +111,8 @@ echo " = = = End list environment variables in effect = = = ="
# assuming metacity attaches to "current" display by default (which should have
# already been set by Hudson). We echo its value here just for extra reference/cross-checks.
-echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin):"
-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin" | grep -v egrep)
+echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm):"
+wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
echo "Window Manager processes: $wmpss"
echo
@@ -135,7 +135,7 @@ ps -ef | grep "metacity" | grep -v grep
echo
echo "Triple check if any window managers are running (at least metacity should be!):"
-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
+wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
echo "Window Manager processes: $wmpss"
echo
echo "extdirprop in runtest: ${extdirprop}"
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
index 447a412..c88398a 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
+++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh
@@ -106,8 +106,8 @@ echo " = = = End list environment variables in effect = = = ="
# assuming metacity attaches to "current" display by default (which should have
# already been set by Hudson). We echo its value here just for extra reference/cross-checks.
-echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin):"
-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin" | grep -v egrep)
+echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm):"
+wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
echo "Window Manager processes: $wmpss"
echo
@@ -160,7 +160,7 @@ ps -ef | grep "metacity" | grep -v grep
echo
echo "Triple check if any window managers are running (at least metacity should be!):"
-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
+wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
echo "Window Manager processes: $wmpss"
echo