commit 0a4ccc2918cedcff17f0471669feb0942649e97b
author Chung-yih Wang <cywang@chromium.org> Fri Apr 25 13:24:14 2014 +0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon May 19 20:34:10 2014 +0000
tree 72f8a002e18a2e87f3d73997c8254467912c3d7a
parent 5e0e6f504e7a548b8bcfb3eac45af1e06d66e899

touchtests: get xorg-conf file(s) from /etc/X11/xorg.conf.d

BUG=chromium:303344
TEST=touchtests all still works correctly both under chroot and
   on a device
CQ-DEPEND=CL:197020

Change-Id: I9af15fde8278f34447bf877a4200b3126c8b90af
Reviewed-on: https://chromium-review.googlesource.com/197015
Reviewed-by: Chung-yih Wang <cywang@chromium.org>
Commit-Queue: Chung-yih Wang <cywang@chromium.org>
Tested-by: Chung-yih Wang <cywang@chromium.org>

framework/src/main.py

diff --git a/framework/src/main.py b/framework/src/main.py
index 8bc32e6..ee937e2 100644
--- a/framework/src/main.py
+++ b/framework/src/main.py
@@ -89,6 +89,7 @@
 
   dir = os.environ["SRC_DIR"]
   print "Recompiling gestures/libevdev/replay..."
+  print "SRC_DIR is %s" % dir
   process = Popen(["make", "-j", str(multiprocessing.cpu_count()),
                   "in-place"], cwd=dir, stdout=PIPE, stderr=STDOUT)
   ret = process.wait()

touchtests

diff --git a/touchtests b/touchtests
index 01ae2b7..a8f1cd6 100644
--- a/touchtests
+++ b/touchtests
@@ -9,8 +9,6 @@
 
 TESTS_DIR=$INSTALL_DIR/tests
 FRAMEWORK_DIR=$INSTALL_DIR/framework
-XORG_CONF_DIR=$INSTALL_DIR/xorg-conf-files
 
 PYTHONPATH=$FRAMEWORK_DIR TESTS_DIR=$TESTS_DIR \
-    XORG_CONF_DIR=$XORG_CONF_DIR SRC_DIR=$SRC_DIR \
-    python $FRAMEWORK_DIR/main.py $*
\ No newline at end of file
+    SRC_DIR=$SRC_DIR \ python $FRAMEWORK_DIR/main.py $*