From 79ff9f136cc864f5b14b6105f37afa02001f7439 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 6 May 2015 15:42:15 -0400 Subject: [PATCH] Change output to fix failing tests. The cause of the different output is a change in o.e.core.resources where the order of visiting a project has changed to become alphabetical. See http://eclip.se/461838 Therefore, our benchmark files must also have the output of subdirectories in alphabetical order. Change-Id: I3331649cf516adbe3b453b11f1ed6733a007ce4d --- .../test1DepCalc2/Benchmarks/sources.mk | 4 ++-- .../test1DepCalc3/Benchmarks/sources.mk | 4 ++-- .../test1DepCalcPreBuild/Benchmarks/sources.mk | 4 ++-- .../oldTypeProjects/2.1/Benchmarks/sources.mk | 2 +- .../oldTypeProjects/2.1CPP/Benchmarks/sources.mk | 2 +- .../multiResConfig/Benchmarks/sources.mk | 6 +++--- .../CDTFortranTest2/Benchmarks/sources.mk | 2 +- .../copyandDeploy/Benchmarks/sources.mk | 2 +- .../multiResConfig/Benchmarks/sources.mk | 6 +++--- .../test with spaces/Benchmarks/sources.mk | 2 +- .../test30Projects/test30_2/Benchmarks/sources.mk | 2 +- .../Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk | 14 +++++++------- .../test_40/Benchmarks/dbg 2/sources.mk | 14 +++++++------- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk index 13cf73bde18..52a3d69926a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk @@ -13,7 +13,7 @@ EXECUTABLES := # Every subdirectory with source files must be described here SUBDIRS := \ -. \ -Sources/sub\ sources \ Sources \ +Sources/sub\ sources \ +. \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk index 13cf73bde18..52a3d69926a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk @@ -13,7 +13,7 @@ EXECUTABLES := # Every subdirectory with source files must be described here SUBDIRS := \ -. \ -Sources/sub\ sources \ Sources \ +Sources/sub\ sources \ +. \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk index 13cf73bde18..52a3d69926a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk @@ -13,7 +13,7 @@ EXECUTABLES := # Every subdirectory with source files must be described here SUBDIRS := \ -. \ -Sources/sub\ sources \ Sources \ +Sources/sub\ sources \ +. \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk index c84afeb85b6..fa1bbce179d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk @@ -13,6 +13,6 @@ EXECUTABLES := # Every subdirectory with source files must be described here SUBDIRS := \ -. \ Functions \ +. \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk index 89b098e5f87..1881eb751a7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk @@ -23,6 +23,6 @@ C_UPPER_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ -. \ Functions \ +. \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk index ec9602a24e5..9adc934fc62 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk @@ -19,8 +19,8 @@ C_UPPER_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ -source2/source21 \ -source2 \ -source1 \ . \ +source1 \ +source2 \ +source2/source21 \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/sources.mk index 95fa187ac97..e1d7d578abe 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/CDTFortranTest2/Benchmarks/sources.mk @@ -16,6 +16,6 @@ EXECUTABLES := # Every subdirectory with source files must be described here SUBDIRS := \ -module \ Sources \ +module \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/sources.mk index 177a1fadf94..b20de370c83 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/Benchmarks/sources.mk @@ -14,6 +14,6 @@ EXECUTABLES := # Every subdirectory with source files must be described here SUBDIRS := \ -. \ Functions \ +. \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/sources.mk index 3f1981e1c5b..4092a172734 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/Benchmarks/sources.mk @@ -18,8 +18,8 @@ C_UPPER_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ -source2/source21 \ -source2 \ -source1 \ . \ +source1 \ +source2 \ +source2/source21 \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sources.mk index 1dc445e5bdb..e9e15023024 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/Benchmarks/sources.mk @@ -13,6 +13,6 @@ EXECUTABLES := # Every subdirectory with source files must be described here SUBDIRS := \ -sub\ folder\ with\ spaces \ . \ +sub\ folder\ with\ spaces \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk index a0edf92ee8c..e340efcf42b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/Benchmarks/sources.mk @@ -17,6 +17,6 @@ LOGFILE := # Every subdirectory with source files must be described here SUBDIRS := \ -. \ ABC \ +. \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk index 913b396275f..9d962fb5338 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk @@ -23,12 +23,12 @@ C_UPPER_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ -dir1/dd/ff \ -dir1/dd/excluded_c \ -dir1/dd/excluded_c/asd \ -d1_1 \ -d1_1/d2_1 \ -d1 \ -d1/d2 \ d1/d2/d3 \ +d1/d2 \ +d1 \ +d1_1/d2_1 \ +d1_1 \ +dir1/dd/excluded_c/asd \ +dir1/dd/excluded_c \ +dir1/dd/ff \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk index 5d9f161bc57..d2895268513 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/sources.mk @@ -23,12 +23,12 @@ C_UPPER_DEPS := # Every subdirectory with source files must be described here SUBDIRS := \ -dir1/dd/ff \ -dir1/dd/excluded_c \ -dir1/dd/excluded_c/asd \ -d1_1 \ -d1_1/d2_1 \ -d1 \ -d1/d2 \ d1/d2/d3 \ +d1/d2 \ +d1 \ +d1_1/d2_1 \ +d1_1 \ +dir1/dd/excluded_c/asd \ +dir1/dd/excluded_c \ +dir1/dd/ff \