Bug 575702: Nondeterministic makefile ordering

Several parts of makefile output were generated by iterating over
HashMaps, which do not have a deterministic iteration order. Use
TreeMaps instead to output in sorted order. This is possible now that
the API function with return type HashMap is no longer public API and
can be changed to return Map instead.

Benchmark files for affected tests are updated to the new ordering.
This would not be strictly necessary: the tests would also succeed
without, since org.eclipse.cdt.managedbuilder.testplugin.
ManagedBuildTestHelper.compareMakefiles() uses a reordering-tolerant
comparison. However, recording the new (now hopefully stable) order
makes future development on makefile generation easier by avoiding
spurious diff output when tests fail due to changes to other parts of
makefiles.

Change-Id: I20f2e51bd5b9e3bcc5da245d781ca5b4a34fc0b2
Signed-off-by: Christian Walther <walther@indel.ch>

11 files changed, 49 insertions, 49 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk
index 97e45a14263..30efe94aa1e 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/d3/subdir.mk
@@ -7,14 +7,14 @@ CPP_SRCS += \
 ../d1/d2/d3/t.cpp \
 ../d1/d2/d3/y.cpp 
 
-OBJS += \
-./d1/d2/d3/t.o \
-./d1/d2/d3/y.o 
-
 CPP_DEPS += \
 ./d1/d2/d3/t.d \
 ./d1/d2/d3/y.d 
 
+OBJS += \
+./d1/d2/d3/t.o \
+./d1/d2/d3/y.o 
+
 
 # Each subdirectory must supply rules for building sources it contributes
 d1/d2/d3/%.o: ../d1/d2/d3/%.cpp d1/d2/d3/subdir.mk
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk
index 41ca581a94b..81c1cc016e0 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/d2/subdir.mk
@@ -7,14 +7,14 @@ CPP_SRCS += \
 ../d1/d2/e.cpp \
 ../d1/d2/r.cpp 
 
-OBJS += \
-./d1/d2/e.o \
-./d1/d2/r.o 
-
 CPP_DEPS += \
 ./d1/d2/e.d \
 ./d1/d2/r.d 
 
+OBJS += \
+./d1/d2/e.o \
+./d1/d2/r.o 
+
 
 # Each subdirectory must supply rules for building sources it contributes
 d1/d2/e.o: ../d1/d2/e.cpp d1/d2/subdir.mk
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk
index b1ed78514ec..ad8bd7f3c56 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1/subdir.mk
@@ -8,16 +8,16 @@ CPP_SRCS += \
 ../d1/u.cpp \
 ../d1/w.cpp 
 
-OBJS += \
-./d1/q.o \
-./d1/u.o \
-./d1/w.o 
-
 CPP_DEPS += \
 ./d1/q.d \
 ./d1/u.d \
 ./d1/w.d 
 
+OBJS += \
+./d1/q.o \
+./d1/u.o \
+./d1/w.o 
+
 
 # Each subdirectory must supply rules for building sources it contributes
 d1/%.o: ../d1/%.cpp d1/subdir.mk
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk
index c077136c01c..0682cb565b2 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/d2_1/subdir.mk
@@ -7,14 +7,14 @@ CPP_SRCS += \
 ../d1_1/d2_1/a.cpp \
 ../d1_1/d2_1/p.cpp 
 
-OBJS += \
-./d1_1/d2_1/a.o \
-./d1_1/d2_1/p.o 
-
 CPP_DEPS += \
 ./d1_1/d2_1/a.d \
 ./d1_1/d2_1/p.d 
 
+OBJS += \
+./d1_1/d2_1/a.o \
+./d1_1/d2_1/p.o 
+
 
 # Each subdirectory must supply rules for building sources it contributes
 d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp d1_1/d2_1/subdir.mk
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk
index d6a2d577f36..6a4559c5876 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/d1_1/subdir.mk
@@ -7,14 +7,14 @@ CPP_SRCS += \
 ../d1_1/i.cpp \
 ../d1_1/o.cpp 
 
-OBJS += \
-./d1_1/i.o \
-./d1_1/o.o 
-
 CPP_DEPS += \
 ./d1_1/i.d \
 ./d1_1/o.d 
 
+OBJS += \
+./d1_1/i.o \
+./d1_1/o.o 
+
 
 # Each subdirectory must supply rules for building sources it contributes
 d1_1/%.o: ../d1_1/%.cpp d1_1/subdir.mk
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk
index 25c6c4515f2..b8165e9f841 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/asd/subdir.mk
@@ -6,12 +6,12 @@
 CPP_SRCS += \
 ../dir1/dd/excluded_c/asd/s.cpp 
 
-OBJS += \
-./dir1/dd/excluded_c/asd/s.o 
-
 CPP_DEPS += \
 ./dir1/dd/excluded_c/asd/s.d 
 
+OBJS += \
+./dir1/dd/excluded_c/asd/s.o 
+
 
 # Each subdirectory must supply rules for building sources it contributes
 dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp dir1/dd/excluded_c/asd/subdir.mk
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk
index 68c2cf0a6be..8d500793617 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/excluded_c/subdir.mk
@@ -6,12 +6,12 @@
 CPP_SRCS += \
 ../dir1/dd/excluded_c/inc.cpp 
 
-OBJS += \
-./dir1/dd/excluded_c/inc.o 
-
 CPP_DEPS += \
 ./dir1/dd/excluded_c/inc.d 
 
+OBJS += \
+./dir1/dd/excluded_c/inc.o 
+
 
 # Each subdirectory must supply rules for building sources it contributes
 dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp dir1/dd/excluded_c/subdir.mk
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk
index 79fe1be5fc7..21ab628be91 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/dir1/dd/ff/subdir.mk
@@ -3,21 +3,21 @@
 ################################################################################
 
 # Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../dir1/dd/ff/vbn.c 
-
 CPP_SRCS += \
 ../dir1/dd/ff/zxc.cpp 
 
-OBJS += \
-./dir1/dd/ff/vbn.o \
-./dir1/dd/ff/zxc.o 
+C_SRCS += \
+../dir1/dd/ff/vbn.c 
+
+CPP_DEPS += \
+./dir1/dd/ff/zxc.d 
 
 C_DEPS += \
 ./dir1/dd/ff/vbn.d 
 
-CPP_DEPS += \
-./dir1/dd/ff/zxc.d 
+OBJS += \
+./dir1/dd/ff/vbn.o \
+./dir1/dd/ff/zxc.o 
 
 
 # Each subdirectory must supply rules for building sources it contributes
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile
index 15341fd9355..f4acfa97436 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/makefile
@@ -26,15 +26,15 @@ endif
 ifneq ($(strip $(CC_DEPS)),)
 -include $(CC_DEPS)
 endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
 ifneq ($(strip $(CPP_DEPS)),)
 -include $(CPP_DEPS)
 endif
 ifneq ($(strip $(CXX_DEPS)),)
 -include $(CXX_DEPS)
 endif
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
 ifneq ($(strip $(C_UPPER_DEPS)),)
 -include $(C_UPPER_DEPS)
 endif
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/objects.mk
index 367436e715e..4df42a24715 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/objects.mk
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/dbg 2/objects.mk
@@ -2,7 +2,7 @@
 # Automatically-generated file. Do not edit!
 ################################################################################
 
-LIBS := -llib2
-
 USER_OBJS := uo2
 
+LIBS := -llib2
+
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 d2895268513..463597703f3 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
@@ -2,24 +2,24 @@
 # Automatically-generated file. Do not edit!
 ################################################################################
 
-C_UPPER_SRCS := 
-C_SRCS := 
-CPP_SRCS := 
-O_SRCS := 
 ASM_SRCS := 
-S_UPPER_SRCS := 
 C++_SRCS := 
-CXX_SRCS := 
 CC_SRCS := 
+CPP_SRCS := 
+CXX_SRCS := 
+C_SRCS := 
+C_UPPER_SRCS := 
 OBJ_SRCS := 
-OBJS := 
+O_SRCS := 
+S_UPPER_SRCS := 
 C++_DEPS := 
-EXECUTABLES := 
 CC_DEPS := 
-C_DEPS := 
 CPP_DEPS := 
 CXX_DEPS := 
+C_DEPS := 
 C_UPPER_DEPS := 
+EXECUTABLES := 
+OBJS := 
 
 # Every subdirectory with source files must be described here
 SUBDIRS := \