[m-rev.] diff: Fix feedback test case failures in nightly builds.

[Paul Bone]

The feedback tests on goliath were failing.  The problem is that the test suite
is run without first building the workspace and the mdprof_create_feedback and
mdprof_report_feedback tools are not available.

tests/feedback/Mmakefile:
    Fix the test case failure by using the mdprof feedback tools in PATH if the
    workspace has not been built.

Index: tests/feedback/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/feedback/Mmakefile,v
retrieving revision 1.1
diff -u -p -b -r1.1 Mmakefile
--- tests/feedback/Mmakefile	5 Dec 2011 05:58:05 -0000	1.1
+++ tests/feedback/Mmakefile	6 Jan 2012 12:51:45 -0000
@@ -14,8 +14,24 @@ TESTS_DIR = ..
 SUBDIRS=
 include $(TESTS_DIR)/Mmake.common
 
-FB_CREATE = ../../deep_profiler/mdprof_create_feedback
-FB_REPORT = ../../deep_profiler/mdprof_report_feedback
+# Try to use the feedback tools in this workspace if available, Otherwise use
+# the feedback tools in PATH
+FB_CREATE_WS = ../../deep_profiler/mdprof_create_feedback
+FB_REPORT_WS = ../../deep_profiler/mdprof_report_feedback
+
+FB_CREATE_SYS = mdprof_create_feedback
+FB_REPORT_SYS = mdprof_report_feedback
+
+FB_CREATE = `if [ -e $(FB_CREATE_WS) ]; then \
+                echo $(FB_CREATE_WS); \
+            else \
+                echo $(FB_CREATE_SYS); \
+            fi`
+FB_REPORT = `if [ -e $(FB_REPORT_WS) ]; then \
+                echo $(FB_REPORT_WS); \
+            else \
+                echo $(FB_REPORT_SYS); \
+            fi`
 
 %.runtest: %.res ;
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 489 bytes
Desc: Digital signature
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20120109/b23142fe/attachment.sig>