Reapply r276185
Fix the test case that should not depend on dir iteration order.
llvm-svn: 276197
diff --git a/llvm/test/tools/llvm-profdata/input-dir.test b/llvm/test/tools/llvm-profdata/input-dir.test
new file mode 100644
index 0000000..d6884d4
--- /dev/null
+++ b/llvm/test/tools/llvm-profdata/input-dir.test
@@ -0,0 +1,22 @@
+# Create an input file.
+RUN: echo "#" > %t.input
+RUN: echo "%t.dir1" >> %t.input
+RUN: echo "2,%t.dir2" >> %t.input
+
+RUN: mkdir -p %t.dir1
+RUN: mkdir -p %t.dir2/subdir
+
+RUN: echo ' ' > %t.dir1/bar
+RUN: echo ' ' > %t.dir1/foo
+RUN: echo ' ' > %t.dir2/bar
+RUN: echo ' ' > %t.dir2/foo
+RUN: echo ' ' > %t.dir2/subdir/baz
+
+RUN: llvm-profdata merge -f %t.input -dump-input-file-list -o /dev/null | FileCheck %s
+RUN: llvm-profdata merge -weighted-input=2,%t.dir2 -dump-input-file-list -o /dev/null %t.dir1 | FileCheck %s
+
+CHECK-DAG: 1,{{.*}}.dir1/bar
+CHECK-DAG: 1,{{.*}}.dir1/foo
+CHECK-DAG: 2,{{.*}}.dir2/bar
+CHECK-DAG: 2,{{.*}}.dir2/foo
+CHECK-DAG: 2,{{.*}}.dir2/subdir/baz
diff --git a/llvm/test/tools/llvm-profdata/input-filenames.test b/llvm/test/tools/llvm-profdata/input-filenames.test
index da0c47bf..4f29e7b 100644
--- a/llvm/test/tools/llvm-profdata/input-filenames.test
+++ b/llvm/test/tools/llvm-profdata/input-filenames.test
@@ -1,17 +1,19 @@
# Create an input file.
RUN: echo '# comment 1' > %t.input
RUN: echo ' # comment 2' >> %t.input
-RUN: echo 'bar' >> %t.input
-RUN: echo ' baz' >> %t.input
+RUN: echo " %t.bar" >> %t.input
+RUN: echo " %t.baz" >> %t.input
RUN: echo "2,%t.weighted" >> %t.input
-# Create the weighted file, since these actually need to exist.
RUN: echo ' ' > %t.weighted
+RUN: echo ' ' > %t.foo
+RUN: echo ' ' > %t.bar
+RUN: echo ' ' > %t.baz
-RUN: llvm-profdata merge -f %t.input -dump-input-file-list -o /dev/null foo | FileCheck %s
-RUN: llvm-profdata merge -input-files %t.input -dump-input-file-list -o /dev/null foo | FileCheck %s
+RUN: llvm-profdata merge -f %t.input -dump-input-file-list -o /dev/null %t.foo | FileCheck %s
+RUN: llvm-profdata merge -input-files %t.input -dump-input-file-list -o /dev/null %t.foo | FileCheck %s
-CHECK: 1,foo
-CHECK-NEXT: 1,bar
-CHECK-NEXT: 1,baz
+CHECK: 1,{{.*}}.foo
+CHECK-NEXT: 1,{{.*}}.bar
+CHECK-NEXT: 1,{{.*}}.baz
CHECK-NEXT: 2,{{.*}}.weighted