Re: [CEDET-devel] Fixes for making CEDET tests work.

[David E. <de...@ra...>]

"Eric M. Ludlam" <er...@si...> writes:
>   I have finally figured out how to use the grep-template stuff to
> fabricate new grep commands in a way that works for semantic symref.
> This should get the unit test running for any platform supported by
> these templates IFF you use an Emacs version with the template
> support, such as Emacs 23.
>
>   If you don't have the template support, I still removed the
> offending command argument to xargs, so that should work too.

cedet-utest now works on FreeBSD 7.1, including symref-grep.

>   There was also a bug related to BSD Make and the integration tests.
> I checked in a change to EDE to try to identify that a version of GNU
> Make is available.  If you encountered this problem of a Makefile
> syntax error, please try it out again.  Thanks!

There are still problems with Make on FreeBSD, simply because 'compile'
is still called with "make" instead of ede-make-command. Additionally,
ede-make-check-version fails because GNU Make has a version output like
"GNU Make 3.81" on my systems.

Attached are the changes I made to make it work under FreeBSD.

-David

Index: ede/ede-make.el
===================================================================
RCS file: /cvsroot/cedet/cedet/ede/ede-make.el,v
retrieving revision 1.1
diff -u -r1.1 ede-make.el
--- ede/ede-make.el	8 Mar 2009 12:51:27 -0000	1.1
+++ ede/ede-make.el	10 Mar 2009 14:03:47 -0000
@@ -84,7 +84,7 @@
 		    "--version")
       ;; Check the buffer for the string
       (goto-char (point-min))
-      (when (looking-at "GNU Make version \\([0-9][^,]+\\),")
+      (when (looking-at "GNU Make\\(?: version\\)? \\([0-9][^,]+\\),")
 	(setq rev (match-string 1))
 	(setq ans (not (inversion-check-version rev nil ede-make-min-version))))
 
Index: tests/cedet-integ-test.el
===================================================================
RCS file: /cvsroot/cedet/cedet/tests/cedet-integ-test.el,v
retrieving revision 1.8
diff -u -r1.8 cedet-integ-test.el
--- tests/cedet-integ-test.el	24 Jan 2009 04:56:26 -0000	1.8
+++ tests/cedet-integ-test.el	10 Mar 2009 14:03:47 -0000
@@ -242,7 +242,7 @@
   ;; 1 f) Create a build file.
   (ede-proj-regenerate)
   ;; 1 g) build the sources.
-  (compile "make")
+  (compile ede-make-command)
   
   (while compilation-in-progress
     (accept-process-output)
Index: tests/cit-cpp.el
===================================================================
RCS file: /cvsroot/cedet/cedet/tests/cit-cpp.el,v
retrieving revision 1.3
diff -u -r1.3 cit-cpp.el
--- tests/cit-cpp.el	6 Mar 2009 14:24:33 -0000	1.3
+++ tests/cit-cpp.el	10 Mar 2009 14:03:47 -0000
@@ -152,7 +152,7 @@
   
   ;; 1 g) build the sources.
   ;; Direct compile to test that make fails properly.
-  (compile "make")
+  (compile ede-make-command)
   ;; @todo - verify make error status
   (while compilation-in-progress
     (accept-process-output)