From: David Engster <dengste@eml.cc>
Date: Mon, 7 Nov 2011 19:34:04 +0000 (+0200)
Subject: * cedet-load.el: Load cogre autoloads.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f0f8984e61f914974eaa5b3428eddb32e485601;p=emacs.git

* cedet-load.el: Load cogre autoloads.

* tests/cedet-integ-test.el: Remove gnustep require.

* tests/cit-android.el: Fix require.

* tests/cit-test.sh: Fix paths when calling integration test.
---

diff --git a/test/manual/cedet/cit-test.sh b/test/manual/cedet/cit-test.sh
index 53dd57d56f6..1e06446b587 100755
--- a/test/manual/cedet/cit-test.sh
+++ b/test/manual/cedet/cit-test.sh
@@ -11,8 +11,8 @@ fi
 OPTIONS=$2
 
 rm -r /tmp/CEDET_INTEG*
-
-$EMACS $OPTIONS -q -l ../common/cedet.el -l cit-load.el -f toggle-debug-on-error  -f toggle-debug-on-quit -f cedet-integ-test-${STYLE}
+cd ..
+$EMACS $OPTIONS -q -l cedet-load.el -l tests/cit-load.el -f toggle-debug-on-error  -f toggle-debug-on-quit -f cedet-integ-test-${STYLE}
 EXITCODE=$?
 
 if [ $EXITCODE -eq 0 ]; then