Tests/RunCMake/LinkLibrariesStrategy: Check ordering results more strongly

11 files changed, 62 insertions, 2 deletions

diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-reverse.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup-reverse.txt
index 7e46d1ba..7e46d1ba 100644
--- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-reverse.txt
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup-reverse.txt
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup.txt
new file mode 100644
index 0000000..6ef12eb
--- /dev/null
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup.txt
@@ -0,0 +1 @@
+^Library 'A' was linked first\.$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup-reverse.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup-reverse.txt
new file mode 100644
index 0000000..7d91bee
--- /dev/null
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup-reverse.txt
@@ -0,0 +1,10 @@
+target \[main\] link dependency ordering:
+  target \[A\]
+  target \[B\]
+  target \[C\]
+  target \[A\]
+
+target \[main\] link line:
+  target \[B\]
+  target \[C\]
+  target \[A\]$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup.txt
new file mode 100644
index 0000000..d4bccc4
--- /dev/null
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup.txt
@@ -0,0 +1,10 @@
+target \[main\] link dependency ordering:
+  target \[A\]
+  target \[B\]
+  target \[C\]
+  target \[A\]
+
+target \[main\] link line:
+  target \[A\]
+  target \[B\]
+  target \[C\]$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr.txt
index 1d8f4ba..7e9a1cd 100644
--- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr.txt
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr.txt
@@ -5,3 +5,7 @@ target \[main\] link dependency ordering:
   target \[A\]
 
 target \[main\] link line:
+  target \[A\]
+  target \[B\]
+  target \[C\]
+  target \[A\]$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup-reverse.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup-reverse.txt
new file mode 100644
index 0000000..7e46d1ba
--- /dev/null
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup-reverse.txt
@@ -0,0 +1 @@
+^Library 'B' was linked first\.$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup.txt
new file mode 100644
index 0000000..7e46d1ba
--- /dev/null
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup.txt
@@ -0,0 +1 @@
+^Library 'B' was linked first\.$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup-reverse.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup-reverse.txt
new file mode 100644
index 0000000..b908fbc
--- /dev/null
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup-reverse.txt
@@ -0,0 +1,9 @@
+target \[main\] link dependency ordering:
+  target \[B\]
+  target \[C\]
+  target \[A\]
+
+target \[main\] link line:
+  target \[B\]
+  target \[C\]
+  target \[A\]$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup.txt
new file mode 100644
index 0000000..b908fbc
--- /dev/null
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup.txt
@@ -0,0 +1,9 @@
+target \[main\] link dependency ordering:
+  target \[B\]
+  target \[C\]
+  target \[A\]
+
+target \[main\] link line:
+  target \[B\]
+  target \[C\]
+  target \[A\]$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr.txt
index 54b02bd..b908fbc 100644
--- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr.txt
+++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr.txt
@@ -4,3 +4,6 @@ target \[main\] link dependency ordering:
   target \[A\]
 
 target \[main\] link line:
+  target \[B\]
+  target \[C\]
+  target \[A\]$
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/RunCMakeTest.cmake b/Tests/RunCMake/LinkLibrariesStrategy/RunCMakeTest.cmake
index 1b02355..8ceb25d 100644
--- a/Tests/RunCMake/LinkLibrariesStrategy/RunCMakeTest.cmake
+++ b/Tests/RunCMake/LinkLibrariesStrategy/RunCMakeTest.cmake
@@ -17,12 +17,24 @@ run_cmake(Unknown)
 
 function(run_strategy case exe)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build)
+  if("DEDUPLICATION=ALL" IN_LIST CMAKE_C_LINK_LIBRARIES_PROCESSING)
+    if("ORDER=REVERSE" IN_LIST CMAKE_C_LINK_LIBRARIES_PROCESSING)
+      set(RunCMake-stderr-file ${case}-stderr-dedup-reverse.txt)
+    else()
+      set(RunCMake-stderr-file ${case}-stderr-dedup.txt)
+    endif()
+  endif()
   run_cmake(${case})
+  unset(RunCMake-stderr-file)
   set(RunCMake_TEST_NO_CLEAN 1)
   run_cmake_command(${case}-build ${CMAKE_COMMAND} --build . --config Debug)
   if(exe)
-    if("ORDER=REVERSE" IN_LIST CMAKE_C_LINK_LIBRARIES_PROCESSING)
-      set(RunCMake-stdout-file ${case}-run-stdout-reverse.txt)
+    if("DEDUPLICATION=ALL" IN_LIST CMAKE_C_LINK_LIBRARIES_PROCESSING)
+      if("ORDER=REVERSE" IN_LIST CMAKE_C_LINK_LIBRARIES_PROCESSING)
+        set(RunCMake-stdout-file ${case}-run-stdout-dedup-reverse.txt)
+      else()
+        set(RunCMake-stdout-file ${case}-run-stdout-dedup.txt)
+      endif()
     endif()
     run_cmake_command(${case}-run ${RunCMake_TEST_BINARY_DIR}/${exe})
     unset(RunCMake-stdout-file)