Use previous results of calls to "File.exists()" in change tracking.

This is the same kind of "external change" as those coming from the
environment or JavaScript files, and is thus handled the same way.

Change-Id: I0a097d6d5c39ece859e6784f65f77f35a7273d59
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 32 insertions, 1 deletions

diff --git a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs b/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs
index cfd897447..8ed267fa5 100644
--- a/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs
+++ b/tests/auto/blackbox/testdata/trackExternalProductChanges/project.qbs
@@ -1,6 +1,10 @@
 import qbs
+import qbs.File
 import "fileList.js" as FileList
 
 CppApplication {
-    files: ["main.cpp"].concat(FileList.fileList()).concat(qbs.getenv("QBS_TEST_PULL_IN_FILE_VIA_ENV") ? ["environmentChange.cpp"] : [])
+    property pathList filesFromEnv: qbs.getenv("QBS_TEST_PULL_IN_FILE_VIA_ENV") ? ["environmentChange.cpp"] : []
+    property pathList filesFromJs: FileList.fileList()
+    property pathList filesFromFs: File.exists(path + "/fileExists.cpp") ? ["fileExists.cpp"] : []
+    files: ["main.cpp"].concat(filesFromJs).concat(filesFromEnv).concat(filesFromFs)
 }
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 8d2f6dbdb..cb91da3fd 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -596,6 +596,7 @@ void TestBlackbox::trackExternalProductChanges()
     QVERIFY(m_qbsStdout.contains("compiling main.cpp"));
     QVERIFY(!m_qbsStdout.contains("compiling environmentChange.cpp"));
     QVERIFY(!m_qbsStdout.contains("compiling jsFileChange.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling fileExists.cpp"));
 
     QbsRunParameters params;
     params.environment.insert("QBS_TEST_PULL_IN_FILE_VIA_ENV", "1");
@@ -603,12 +604,14 @@ void TestBlackbox::trackExternalProductChanges()
     QVERIFY(!m_qbsStdout.contains("compiling main.cpp"));
     QVERIFY(m_qbsStdout.contains("compiling environmentChange.cpp"));
     QVERIFY(!m_qbsStdout.contains("compiling jsFileChange.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling fileExists.cpp"));
 
     rmDirR(buildDir);
     QCOMPARE(runQbs(), 0);
     QVERIFY(m_qbsStdout.contains("compiling main.cpp"));
     QVERIFY(!m_qbsStdout.contains("compiling environmentChange.cpp"));
     QVERIFY(!m_qbsStdout.contains("compiling jsFileChange.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling fileExists.cpp"));
 
     waitForNewTimestamp();
     QFile jsFile("fileList.js");
@@ -622,6 +625,30 @@ void TestBlackbox::trackExternalProductChanges()
     QVERIFY(!m_qbsStdout.contains("compiling main.cpp"));
     QVERIFY(!m_qbsStdout.contains("compiling environmentChange.cpp"));
     QVERIFY(m_qbsStdout.contains("compiling jsFileChange.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling fileExists.cpp"));
+
+    rmDirR(buildDir);
+    QVERIFY(jsFile.open(QIODevice::ReadWrite));
+    jsCode = jsFile.readAll();
+    jsCode.replace("['jsFileChange.cpp']", "[]");
+    jsFile.resize(0);
+    jsFile.write(jsCode);
+    jsFile.close();
+    QCOMPARE(runQbs(), 0);
+    QVERIFY(m_qbsStdout.contains("compiling main.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling environmentChange.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling jsFileChange.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling fileExists.cpp"));
+
+    QFile cppFile("fileExists.cpp");
+    QVERIFY(cppFile.open(QIODevice::WriteOnly));
+    cppFile.write("void fileExists() { }\n");
+    cppFile.close();
+    QCOMPARE(runQbs(), 0);
+    QVERIFY(!m_qbsStdout.contains("compiling main.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling environmentChange.cpp"));
+    QVERIFY(!m_qbsStdout.contains("compiling jsFileChange.cpp"));
+    QVERIFY(m_qbsStdout.contains("compiling fileExists.cpp"));
 }
 
 void TestBlackbox::trackRemoveFile()