Advanced find autotests now working again.

Make autotests work again on Ubuntu 12.04 (when launched from English language).
Add extra check and notification if wmctrl is missing.

diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py
index 1753f1460b16b3bda05ab7d231dc3edceb65b8d5..95e996b96392ed93d7f24e32e05eec63a1c59472 100755 (executable)
--- a/development/autotests/keytest.py
+++ b/development/autotests/keytest.py
@@ -393,6 +393,7 @@ while not failed:
         lang = c[5:].rstrip()
         print "Setting LANG=" + lang + "\n"
         os.environ['LANG'] = lang
+        os.environ['LANGUAGE'] = lang
 # If it doesn't exist, create a link <locale_dir>/<country-code>/LC_MESSAGES/lyx<version-suffix>.mo
 # pointing to the corresponding .gmo file. Needed to let lyx find the right translation files.
 # See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg165613.html

diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh
index b1ddf6ea0c9e298d0e177495f16f3de60e9f4f4c..3a175e7c60e755ef1eaddffe27282fa66e03399f 100755 (executable)
--- a/development/autotests/run-tests.sh
+++ b/development/autotests/run-tests.sh
@@ -15,6 +15,12 @@ if [ "$XVKBD_HACKED" != "" ]; then
     fi
 fi
 
+if [ "$(which wmctrl)" == "" ]; then
+    echo "You need to install wmctrl first, try:"
+    echo "  sudo apt-get install wmctrl"
+    exit -1;
+fi
+
 export XVKBD_EXE=../$XVKBD_EXE
 export KEYTEST=../keytest.py
 LYX_HOME=out-home