Speculatively revert "[BuildSystem] Fix bug where directory contents
were always recomputed."
- This fix, while safe, appears to have exposed a possible problem with
one of the tests on 16.05 -- reverting while I investigate further.
This reverts commit eb70edac0bdf3d7fcb42e31165324bcbc851cef5.
diff --git a/lib/BuildSystem/BuildSystem.cpp b/lib/BuildSystem/BuildSystem.cpp
index bd1e3d6..38f748b 100644
--- a/lib/BuildSystem/BuildSystem.cpp
+++ b/lib/BuildSystem/BuildSystem.cpp
@@ -666,7 +666,7 @@
if (info.isMissing()) {
return value.isMissingInput();
} else {
- return value.isDirectoryContents() && value.getOutputInfo() == info;
+ return value.isExistingInput() && value.getOutputInfo() == info;
}
}
};
diff --git a/tests/BuildSystem/Build/directory-contents.llbuild b/tests/BuildSystem/Build/directory-contents.llbuild
deleted file mode 100644
index bab1fbe..0000000
--- a/tests/BuildSystem/Build/directory-contents.llbuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Check that directory contents are rebuilt *only* when appropriate.
-#
-# RUN: rm -rf %t.build
-# RUN: mkdir -p %t.build
-# RUN: cp %s %t.build/build.llbuild
-# RUN: mkdir -p %t.build/dir
-# RUN: %{llbuild} buildsystem build --serial --trace %t.initial.trace --chdir %t.build
-# RUN: %{FileCheck} --check-prefix=CHECK-INITIAL --input-file=%t.initial.trace %s
-#
-# CHECK-INITIAL: { "new-rule", "[[RULE_NAME:R[0-9]+]]", "Ddir" },
-# CHECK-INITIAL: { "rule-needs-to-run", "[[RULE_NAME]]", "never-built" },
-
-
-# A null rebuild shouldn't rebuild the directory.
-#
-# RUN: %{llbuild} buildsystem build --serial --trace %t.rebuild.trace --chdir %t.build
-# RUN: %{FileCheck} --check-prefix=CHECK-REBUILD --input-file=%t.rebuild.trace %s
-#
-# CHECK-REBUILD: { "new-rule", "[[RULE_NAME:R[0-9]+]]", "Ddir" },
-# CHECK-REBUILD: { "rule-does-not-need-to-run", "[[RULE_NAME]]" },
-
-
-# A rebuild after adding a new file should rebuild the directory.
-#
-# RUN: touch %t.build/dir/file
-# RUN: %{llbuild} buildsystem build --serial --trace %t.modified.trace --chdir %t.build
-# RUN: %{FileCheck} --check-prefix=CHECK-MODIFIED --input-file=%t.modified.trace %s
-#
-# CHECK-MODIFIED: { "new-rule", "[[RULE_NAME:R[0-9]+]]", "Ddir" },
-# CHECK-MODIFIED: { "rule-needs-to-run", "[[RULE_NAME]]", "invalid-value" },
-
-client:
- name: basic
-
-targets:
- "": ["<all>"]
-
-commands:
- C.all:
- tool: phony
- inputs: ["dir/"]
- outputs: ["<all>"]
