Test makefile benchmark changes to match changes in makefile generation for double quotes and Echo.

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f1.c

@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include "test_ar.h"
-
-void f1_ar()
-{
-	printf ( "Hello from f1_ar.\n" ) ;
-	return ;
-}

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/f2.c

@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include "test_ar.h"
-
-void f2_ar()
-{
-	printf ( "Hello from f2_ar.\n" ) ;
-	return ;
-}

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib/test_ar.h

@@ -1,2 +0,0 @@
-void f1_ar() ;
-void f2_ar() ;

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/f1_30.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "test_ar.h"
+#include "test_ar_30.h"
 
 void f1_ar()
 {

build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/linkedLib30/f2_30.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "test_ar.h"
+#include "test_ar_30.h"
 
 void f2_ar()
 {

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedCommandLineGeneratorTest.java

@@ -45,12 +45,12 @@ public class ManagedCommandLineGeneratorTest extends TestCase {
     private static String INPUTS_VAL = "[inputs]";
     private static String[] INPUTS_ARRAY_VAL = INPUTS_VAL.split( "\\s" );
     private static String[] commandLineEtalonesForPatterns = {
-            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "'" + OUTPUT_VAL + "'" + " " + "'" + INPUTS_VAL + "'",
+            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"" + " " + "\"" + INPUTS_VAL + "\"",
             COMMAND_VAL, COMMAND_VAL + " " + FLAGS_VAL, COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL, 
             COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL,
-            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL +  OUTPUT_PREFIX_VAL + "'" + OUTPUT_VAL + "'",
-            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "'" + OUTPUT_VAL + "'" + " " + "'" + INPUTS_VAL + "'",
-            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "'" + OUTPUT_VAL + "'" + " " + "${WRONG_VAR_NAME}" };
+            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL +  OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"",
+            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"" + " " + "\"" + INPUTS_VAL + "\"",
+            COMMAND_VAL + " " + FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + "\"" + OUTPUT_VAL + "\"" + " " + "${WRONG_VAR_NAME}" };
     private static String[] commandLineEtalonesForParameters = {
             FLAGS_VAL + " " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + OUTPUT_VAL + " " + INPUTS_VAL,
             COMMAND_VAL + "  " + OUTPUT_FLAG_VAL + OUTPUT_PREFIX_VAL + OUTPUT_VAL + " " + INPUTS_VAL,

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java

@@ -300,20 +300,20 @@ public class ManagedProject30MakefileTests extends TestCase {
 				 //Path.fromOSString("subdir.mk")   // Can't compare this yet since it contains absolute paths!
 				 Path.fromOSString("sources.mk")}; 
 		IPath[] linkedFiles = {
-				 Path.fromOSString("f1.c"), 
-				 Path.fromOSString("f2.c"), 
-				 Path.fromOSString("test_ar.h")};
-		File srcDirFile = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/linkedLib/"));
+				 Path.fromOSString("f1_30.c"), 
+				 Path.fromOSString("f2_30.c"), 
+				 Path.fromOSString("test_ar_30.h")};
+		File srcDirFile = CTestPlugin.getFileInPlugin(new Path("resources/test30Projects/linkedLib30/"));
 		IPath srcDir = Path.fromOSString(srcDirFile.toString());
 		IPath tmpSubDir = Path.fromOSString("CDTMBSTest");
 		IPath tmpDir = ManagedBuildTestHelper.copyFilesToTempDir(srcDir, tmpSubDir, linkedFiles);
 		try {
-			IProject[] projects = createProjects("linkedLib", null, "cdt.managedbuild.target.gnu30.lib", true);
+			IProject[] projects = createProjects("linkedLib30", null, "cdt.managedbuild.target.gnu30.lib", true);
 			//  There should be only one project.  Add our linked files to it.
 			IProject project = projects[0];
-			createFileLink(project, tmpDir, "f1.c", "f1.c");
-			createFileLink(project, tmpDir, "f2link.c", "f2.c");
-			createFileLink(project, tmpDir, "test_ar.h", "test_ar.h");
+			createFileLink(project, tmpDir, "f1_30.c", "f1_30.c");
+			createFileLink(project, tmpDir, "f2link_30.c", "f2_30.c");
+			createFileLink(project, tmpDir, "test_ar_30.h", "test_ar_30.h");
 			//  Build the project
 			buildProjects(projects, makefiles);
 		} finally {ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);}