From 673027044fb8214353aba3418da3c4e261d5c14c Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 2 Jun 2020 00:46:02 -0400 Subject: [PATCH 1/8] Dependencies: Small cleanup in FineGrainedDependencies.{h,cpp} --- include/swift/AST/FineGrainedDependencies.h | 2 +- lib/AST/FineGrainedDependencies.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/swift/AST/FineGrainedDependencies.h b/include/swift/AST/FineGrainedDependencies.h index f76a0f5305484..02084b51bd10c 100644 --- a/include/swift/AST/FineGrainedDependencies.h +++ b/include/swift/AST/FineGrainedDependencies.h @@ -1,4 +1,4 @@ -//===----- FineGrainedependencies.h -----------------------------*- C++ -*-===// +//===----- FineGrainedDependencies.h ----------------------------*- C++ -*-===// // // This source file is part of the Swift.org open source project // diff --git a/lib/AST/FineGrainedDependencies.cpp b/lib/AST/FineGrainedDependencies.cpp index b3f9c752b0e80..62d37ed24273b 100644 --- a/lib/AST/FineGrainedDependencies.cpp +++ b/lib/AST/FineGrainedDependencies.cpp @@ -10,8 +10,6 @@ // //===----------------------------------------------------------------------===// -#include - #include "swift/AST/FineGrainedDependencies.h" // may not all be needed From d59a76c248613dbd8348d608cbf4b3f704d056b0 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 2 Jun 2020 00:46:55 -0400 Subject: [PATCH 2/8] Dependencies: New binary format for fine-grained dependency graph --- include/swift/AST/FileSystem.h | 1 + include/swift/AST/FineGrainedDependencies.h | 6 +- .../swift/AST/FineGrainedDependencyFormat.h | 106 ++++ lib/AST/CMakeLists.txt | 1 + lib/AST/FineGrainedDependencies.cpp | 24 +- lib/AST/FineGrainedDependencyFormat.cpp | 482 ++++++++++++++++++ lib/AST/FrontendSourceFileDepGraphFactory.cpp | 8 +- .../FineGrainedDependencyDriverGraph.cpp | 2 + 8 files changed, 621 insertions(+), 9 deletions(-) create mode 100644 include/swift/AST/FineGrainedDependencyFormat.h create mode 100644 lib/AST/FineGrainedDependencyFormat.cpp diff --git a/include/swift/AST/FileSystem.h b/include/swift/AST/FileSystem.h index 90d693a4fee9e..15641164c3e08 100644 --- a/include/swift/AST/FileSystem.h +++ b/include/swift/AST/FileSystem.h @@ -15,6 +15,7 @@ #include "swift/Basic/FileSystem.h" #include "swift/AST/DiagnosticEngine.h" +#include "swift/AST/DiagnosticsCommon.h" namespace swift { diff --git a/include/swift/AST/FineGrainedDependencies.h b/include/swift/AST/FineGrainedDependencies.h index 02084b51bd10c..854d0e921fa76 100644 --- a/include/swift/AST/FineGrainedDependencies.h +++ b/include/swift/AST/FineGrainedDependencies.h @@ -632,6 +632,11 @@ class DepGraphNode { const DependencyKey &getKey() const { return key; } + /// Only used when the driver is reading a SourceFileDepGraphNode. + void setKey(const DependencyKey &key) { + this->key = key; + } + const Optional getFingerprint() const { if (fingerprint) { return StringRef(fingerprint.getValue()); @@ -872,7 +877,6 @@ class SourceFileDepGraph { void emitDotFile(StringRef outputPath, DiagnosticEngine &diags); -private: void addNode(SourceFileDepGraphNode *n) { n->setSequenceNumber(allNodes.size()); allNodes.push_back(n); diff --git a/include/swift/AST/FineGrainedDependencyFormat.h b/include/swift/AST/FineGrainedDependencyFormat.h new file mode 100644 index 0000000000000..c514a5217c75f --- /dev/null +++ b/include/swift/AST/FineGrainedDependencyFormat.h @@ -0,0 +1,106 @@ +//===---- FineGrainedDependencyFormat.h - swiftdeps format ---*- C++ -*-======// +// +// This source file is part of the Swift.org open source project +// +// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors +// Licensed under Apache License v2.0 with Runtime Library Exception +// +// See https://swift.org/LICENSE.txt for license information +// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors +// +//===----------------------------------------------------------------------===// + +#ifndef SWIFT_AST_FINEGRAINEDDEPENDENCYFORMAT_H +#define SWIFT_AST_FINEGRAINEDDEPENDENCYFORMAT_H + +#include "llvm/Bitcode/RecordLayout.h" +#include "llvm/Bitstream/BitCodes.h" + +namespace llvm { +class MemoryBuffer; +} + +namespace swift { + +class DiagnosticEngine; + +namespace fine_grained_dependencies { + +class SourceFileDepGraph; + +using llvm::BCFixed; +using llvm::BCVBR; +using llvm::BCBlob; +using llvm::BCRecordLayout; + +const unsigned char FINE_GRAINED_DEPDENENCY_FORMAT_SIGNATURE[] = {'D', 'E', 'P', 'S'}; + +const unsigned FINE_GRAINED_DEPENDENCY_FORMAT_VERSION_MAJOR = 1; + +/// Increment this on every change. +const unsigned FINE_GRAINED_DEPENDENCY_FORMAT_VERSION_MINOR = 0; + +using IdentifierIDField = BCVBR<13>; + +using NodeKindField = BCFixed<3>; +using DeclAspectField = BCFixed<1>; + +const unsigned RECORD_BLOCK_ID = llvm::bitc::FIRST_APPLICATION_BLOCKID; + +namespace record_block { + enum { + METADATA = 1, + SOURCE_FILE_DEP_GRAPH_NODE, + FINGERPRINT_NODE, + DEPENDS_ON_DEFINITION_NODE, + IDENTIFIER_NODE, + }; + + using MetadataLayout = BCRecordLayout< + METADATA, // ID + BCFixed<16>, // Dependency graph format major version + BCFixed<16>, // Dependency graph format minor version + BCBlob // Compiler version string + >; + + using SourceFileDepGraphNodeLayout = BCRecordLayout< + SOURCE_FILE_DEP_GRAPH_NODE, // ID + NodeKindField, // Dependency key node kind + DeclAspectField, // Dependency key declaration aspect + IdentifierIDField, // Dependency key mangled context type name + IdentifierIDField, // Dependency key basic name + BCFixed<1> // Is this a "provides" node? + >; + + // Optionally follows DEPENDS_ON_DEFINITION_NODE. + using FingerprintNodeLayout = BCRecordLayout< + FINGERPRINT_NODE, + BCBlob + >; + + // Optionally follows SOURCE_FILE_DEP_GRAPH_NODE and FINGERPRINT_NODE. + using DependsOnDefNodeLayout = BCRecordLayout< + DEPENDS_ON_DEFINITION_NODE, + BCVBR<16> + >; + + // Optionally follows all other nodes. + using IdentifierNodeLayout = BCRecordLayout< + IDENTIFIER_NODE, + BCBlob + >; +} + +bool readFineGrainedDependencyGraph(llvm::MemoryBuffer &buffer, + SourceFileDepGraph &g); + +bool readFineGrainedDependencyGraph(llvm::StringRef path, + SourceFileDepGraph &g); + +bool writeFineGrainedDependencyGraph(DiagnosticEngine &diags, llvm::StringRef path, + const SourceFileDepGraph &g); + +} // namespace fine_grained_dependencies +} // namespace swift + +#endif diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt index bc655a43df383..26d74feb33012 100644 --- a/lib/AST/CMakeLists.txt +++ b/lib/AST/CMakeLists.txt @@ -45,6 +45,7 @@ add_swift_host_library(swiftAST STATIC Evaluator.cpp Expr.cpp FineGrainedDependencies.cpp + FineGrainedDependencyFormat.cpp FrontendSourceFileDepGraphFactory.cpp GenericEnvironment.cpp GenericSignature.cpp diff --git a/lib/AST/FineGrainedDependencies.cpp b/lib/AST/FineGrainedDependencies.cpp index 62d37ed24273b..ad553152e2b6b 100644 --- a/lib/AST/FineGrainedDependencies.cpp +++ b/lib/AST/FineGrainedDependencies.cpp @@ -17,6 +17,7 @@ #include "swift/AST/DiagnosticsCommon.h" #include "swift/AST/DiagnosticsFrontend.h" #include "swift/AST/FileSystem.h" +#include "swift/AST/FineGrainedDependencyFormat.h" #include "swift/Basic/FileSystem.h" #include "swift/Basic/LLVM.h" #include "swift/Demangling/Demangle.h" @@ -29,6 +30,7 @@ #include "llvm/Support/Path.h" #include "llvm/Support/YAMLParser.h" + // This file holds the definitions for the fine-grained dependency system // that are likely to be stable as it moves away from the status quo. // These include the graph structures common to both programs and also @@ -50,13 +52,21 @@ Optional SourceFileDepGraph::loadFromPath(StringRef path) { Optional SourceFileDepGraph::loadFromBuffer(llvm::MemoryBuffer &buffer) { - SourceFileDepGraph fg; - llvm::yaml::Input yamlReader(llvm::MemoryBufferRef(buffer), nullptr); - yamlReader >> fg; - if (yamlReader.error()) - return None; - // return fg; compiles for Mac but not Linux, because it cannot be copied. - return Optional(std::move(fg)); + if (false) { + SourceFileDepGraph fg; + llvm::yaml::Input yamlReader(llvm::MemoryBufferRef(buffer), nullptr); + yamlReader >> fg; + if (yamlReader.error()) + return None; + // return fg; compiles for Mac but not Linux, because it cannot be copied. + return Optional(std::move(fg)); + } else { + SourceFileDepGraph fg; + if (swift::fine_grained_dependencies::readFineGrainedDependencyGraph( + buffer, fg)) + return None; + return Optional(std::move(fg)); + } } //============================================================================== diff --git a/lib/AST/FineGrainedDependencyFormat.cpp b/lib/AST/FineGrainedDependencyFormat.cpp new file mode 100644 index 0000000000000..c3b7f0ef986b1 --- /dev/null +++ b/lib/AST/FineGrainedDependencyFormat.cpp @@ -0,0 +1,482 @@ +//===---- FineGrainedDependencyFormat.cpp - reading and writing swiftdeps -===// +// +// This source file is part of the Swift.org open source project +// +// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors +// Licensed under Apache License v2.0 with Runtime Library Exception +// +// See https://swift.org/LICENSE.txt for license information +// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors +// +//===----------------------------------------------------------------------===// + +#include "swift/AST/FileSystem.h" +#include "swift/AST/FineGrainedDependencies.h" +#include "swift/AST/FineGrainedDependencyFormat.h" +#include "swift/Basic/PrettyStackTrace.h" +#include "swift/Basic/Version.h" +#include "llvm/ADT/SmallVector.h" +#include "llvm/ADT/StringMap.h" +#include "llvm/Bitstream/BitstreamReader.h" +#include "llvm/Bitstream/BitstreamWriter.h" +#include "llvm/Support/Allocator.h" +#include "llvm/Support/MemoryBuffer.h" + +using namespace swift; +using namespace fine_grained_dependencies; + +namespace { + +class Deserializer { + std::vector Identifiers; + + llvm::BitstreamCursor Cursor; + + SmallVector Scratch; + StringRef BlobData; + + bool readSignature(); + bool enterTopLevelBlock(); + bool readMetadata(); + + llvm::Optional getIdentifier(unsigned n); + +public: + Deserializer(llvm::MemoryBufferRef Data) : Cursor(Data) {} + bool readFineGrainedDependencyGraph(SourceFileDepGraph &g); +}; + +} // end namespace + +bool Deserializer::readSignature() { + for (unsigned char byte : FINE_GRAINED_DEPDENENCY_FORMAT_SIGNATURE) { + if (Cursor.AtEndOfStream()) + return true; + if (auto maybeRead = Cursor.Read(8)) { + if (maybeRead.get() != byte) + return true; + } else { + return true; + } + } + return false; +} + +bool Deserializer::enterTopLevelBlock() { + { + auto next = Cursor.advance(); + if (!next) { + consumeError(next.takeError()); + return true; + } + + if (next->Kind != llvm::BitstreamEntry::SubBlock) + return true; + + if (next->ID != llvm::bitc::BLOCKINFO_BLOCK_ID) + return true; + + if (!Cursor.ReadBlockInfoBlock()) + return true; + } + + { + auto next = Cursor.advance(); + if (!next) { + consumeError(next.takeError()); + return true; + } + + if (next->Kind != llvm::BitstreamEntry::SubBlock) + return true; + + if (next->ID != RECORD_BLOCK_ID) + return true; + + if (auto err = Cursor.EnterSubBlock(RECORD_BLOCK_ID)) { + consumeError(std::move(err)); + return true; + } + } + + return false; +} + +bool Deserializer::readMetadata() { + using namespace record_block; + + auto entry = Cursor.advance(); + if (!entry) { + consumeError(entry.takeError()); + return true; + } + + if (entry->Kind != llvm::BitstreamEntry::Record) + return true; + + auto recordID = Cursor.readRecord(entry->ID, Scratch, &BlobData); + if (!recordID) { + consumeError(recordID.takeError()); + return true; + } + + if (*recordID != METADATA) + return true; + + unsigned majorVersion, minorVersion; + + MetadataLayout::readRecord(Scratch, majorVersion, minorVersion); + if (majorVersion != FINE_GRAINED_DEPENDENCY_FORMAT_VERSION_MAJOR || + minorVersion != FINE_GRAINED_DEPENDENCY_FORMAT_VERSION_MINOR) { + return true; + } + + return false; +} + +static llvm::Optional getNodeKind(unsigned nodeKind) { + if (nodeKind < unsigned(NodeKind::kindCount)) + return NodeKind(nodeKind); + return None; +} + +static llvm::Optional getDeclAspect(unsigned declAspect) { + if (declAspect < unsigned(DeclAspect::aspectCount)) + return DeclAspect(declAspect); + return None; +} + +bool Deserializer::readFineGrainedDependencyGraph(SourceFileDepGraph &g) { + using namespace record_block; + + if (readSignature()) + return true; + + if (enterTopLevelBlock()) + return true; + + if (readMetadata()) + return true; + + SourceFileDepGraphNode *node = nullptr; + size_t sequenceNumber = 0; + + while (!Cursor.AtEndOfStream()) { + auto entry = cantFail(Cursor.advance(), "Advance bitstream cursor"); + + if (entry.Kind == llvm::BitstreamEntry::EndBlock) { + Cursor.ReadBlockEnd(); + assert(Cursor.GetCurrentBitNo() % CHAR_BIT == 0); + break; + } + + if (entry.Kind != llvm::BitstreamEntry::Record) + llvm::report_fatal_error("Bad bitstream entry kind"); + + Scratch.clear(); + unsigned recordID = cantFail( + Cursor.readRecord(entry.ID, Scratch, &BlobData), + "Read bitstream record"); + + switch (recordID) { + case METADATA: { + // METADATA must appear at the beginning and is handled by readMetadata(). + llvm::report_fatal_error("Unexpected METADATA record"); + break; + } + + case SOURCE_FILE_DEP_GRAPH_NODE: { + unsigned nodeKindID, declAspectID, contextID, nameID, isProvides; + SourceFileDepGraphNodeLayout::readRecord(Scratch, nodeKindID, declAspectID, + contextID, nameID, isProvides); + node = new SourceFileDepGraphNode(); + node->setSequenceNumber(sequenceNumber++); + g.addNode(node); + + auto nodeKind = getNodeKind(nodeKindID); + if (!nodeKind) + llvm::report_fatal_error("Bad node kind"); + auto declAspect = getDeclAspect(declAspectID); + if (!declAspect) + llvm::report_fatal_error("Bad decl aspect"); + auto context = getIdentifier(contextID); + if (!context) + llvm::report_fatal_error("Bad context"); + auto name = getIdentifier(nameID); + if (!name) + llvm::report_fatal_error("Bad identifier"); + + node->setKey(DependencyKey(*nodeKind, *declAspect, *context, *name)); + if (isProvides) + node->setIsProvides(); + break; + } + + case FINGERPRINT_NODE: { + // FINGERPRINT_NODE must follow a SOURCE_FILE_DEP_GRAPH_NODE. + if (node == nullptr) + llvm::report_fatal_error("Unexpected FINGERPRINT_NODE record"); + + node->setFingerprint(BlobData); + break; + } + + case DEPENDS_ON_DEFINITION_NODE: { + // DEPENDS_ON_DEFINITION_NODE must follow a SOURCE_FILE_DEP_GRAPH_NODE. + if (node == nullptr) + llvm::report_fatal_error("Unexpected DEPENDS_ON_DEFINITION_NODE record"); + + unsigned dependsOnDefID; + DependsOnDefNodeLayout::readRecord(Scratch, dependsOnDefID); + + node->addDefIDependUpon(dependsOnDefID); + break; + } + + case IDENTIFIER_NODE: { + // IDENTIFIER_NODE must come before SOURCE_FILE_DEP_GRAPH_NODE. + if (node != nullptr) + llvm::report_fatal_error("Unexpected IDENTIFIER_NODE record"); + + IdentifierNodeLayout::readRecord(Scratch); + Identifiers.push_back(BlobData.str()); + break; + } + + default: { + llvm::report_fatal_error("Unknown record ID"); + } + } + } + + return false; +} + +bool swift::fine_grained_dependencies::readFineGrainedDependencyGraph( + llvm::MemoryBuffer &buffer, SourceFileDepGraph &g) { + Deserializer deserializer(buffer.getMemBufferRef()); + return deserializer.readFineGrainedDependencyGraph(g); +} + +bool swift::fine_grained_dependencies::readFineGrainedDependencyGraph( + StringRef path, SourceFileDepGraph &g) { + auto buffer = llvm::MemoryBuffer::getFile(path); + if (!buffer) + return false; + + return readFineGrainedDependencyGraph(*buffer.get(), g); +} + +llvm::Optional Deserializer::getIdentifier(unsigned n) { + if (n == 0) + return std::string(); + + --n; + if (n >= Identifiers.size()) + return None; + + return Identifiers[n]; +} + +namespace { + +class Serializer { + llvm::StringMap IdentifierIDs; + unsigned LastIdentifierID = 0; + std::vector IdentifiersToWrite; + + SmallVector Buffer; + llvm::BitstreamWriter Out{Buffer}; + + /// A reusable buffer for emitting records. + SmallVector ScratchRecord; + + std::array AbbrCodes; + + void writeFineGrainedDependencyGraph(const SourceFileDepGraph &g); + + void addIdentifier(StringRef str); + unsigned getIdentifier(StringRef str); + + template + void registerRecordAbbr() { + using AbbrArrayTy = decltype(AbbrCodes); + static_assert(Layout::Code <= std::tuple_size::value, + "layout has invalid record code"); + AbbrCodes[Layout::Code] = Layout::emitAbbrev(Out); + } + + void emitBlockID(unsigned ID, StringRef name, + SmallVectorImpl &nameBuffer); + + void emitRecordID(unsigned ID, StringRef name, + SmallVectorImpl &nameBuffer); + + void writeSignature(); + void writeBlockInfoBlock(); + void writeMetadata(); + +public: + void writeFineGrainedDependencyGraph(llvm::raw_ostream &os, + const SourceFileDepGraph &g); +}; + +} // end namespace + +/// Record the name of a block. +void Serializer::emitBlockID(unsigned ID, StringRef name, + SmallVectorImpl &nameBuffer) { + SmallVector idBuffer; + idBuffer.push_back(ID); + Out.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETBID, idBuffer); + + // Emit the block name if present. + if (name.empty()) + return; + nameBuffer.resize(name.size()); + memcpy(nameBuffer.data(), name.data(), name.size()); + Out.EmitRecord(llvm::bitc::BLOCKINFO_CODE_BLOCKNAME, nameBuffer); +} + +void Serializer::emitRecordID(unsigned ID, StringRef name, + SmallVectorImpl &nameBuffer) { + assert(ID < 256 && "can't fit record ID in next to name"); + nameBuffer.resize(name.size()+1); + nameBuffer[0] = ID; + memcpy(nameBuffer.data()+1, name.data(), name.size()); + Out.EmitRecord(llvm::bitc::BLOCKINFO_CODE_SETRECORDNAME, nameBuffer); +} + +void Serializer::writeSignature() { + for (auto c : FINE_GRAINED_DEPDENENCY_FORMAT_SIGNATURE) + Out.Emit((unsigned) c, 8); +} + +void Serializer::writeBlockInfoBlock() { + llvm::BCBlockRAII restoreBlock(Out, llvm::bitc::BLOCKINFO_BLOCK_ID, 2); + + SmallVector nameBuffer; +#define BLOCK(X) emitBlockID(X ## _ID, #X, nameBuffer) +#define BLOCK_RECORD(K, X) emitRecordID(K::X, #X, nameBuffer) + + BLOCK(RECORD_BLOCK); + BLOCK_RECORD(record_block, METADATA); + BLOCK_RECORD(record_block, SOURCE_FILE_DEP_GRAPH_NODE); + BLOCK_RECORD(record_block, FINGERPRINT_NODE); + BLOCK_RECORD(record_block, DEPENDS_ON_DEFINITION_NODE); + BLOCK_RECORD(record_block, IDENTIFIER_NODE); +} + +void Serializer::writeMetadata() { + using namespace record_block; + + MetadataLayout::emitRecord(Out, ScratchRecord, + AbbrCodes[MetadataLayout::Code], + FINE_GRAINED_DEPENDENCY_FORMAT_VERSION_MAJOR, + FINE_GRAINED_DEPENDENCY_FORMAT_VERSION_MINOR, + version::getSwiftFullVersion()); +} + +void +Serializer::writeFineGrainedDependencyGraph(const SourceFileDepGraph &g) { + writeSignature(); + writeBlockInfoBlock(); + + llvm::BCBlockRAII restoreBlock(Out, RECORD_BLOCK_ID, 8); + + using namespace record_block; + + registerRecordAbbr(); + registerRecordAbbr(); + registerRecordAbbr(); + registerRecordAbbr(); + registerRecordAbbr(); + + writeMetadata(); + + // Make a pass to collect all unique strings + g.forEachNode([&](SourceFileDepGraphNode *node) { + addIdentifier(node->getKey().getContext()); + addIdentifier(node->getKey().getName()); + }); + + // Write the strings + for (auto str : IdentifiersToWrite) { + IdentifierNodeLayout::emitRecord(Out, ScratchRecord, + AbbrCodes[IdentifierNodeLayout::Code], + str); + } + + size_t sequenceNumber = 0; + + // Now write each graph node + g.forEachNode([&](SourceFileDepGraphNode *node) { + SourceFileDepGraphNodeLayout::emitRecord(Out, ScratchRecord, + AbbrCodes[SourceFileDepGraphNodeLayout::Code], + unsigned(node->getKey().getKind()), + unsigned(node->getKey().getAspect()), + getIdentifier(node->getKey().getContext()), + getIdentifier(node->getKey().getName()), + node->getIsProvides() ? 1 : 0); + assert(sequenceNumber == node->getSequenceNumber()); + sequenceNumber++; + (void) sequenceNumber; + + if (auto fingerprint = node->getFingerprint()) { + FingerprintNodeLayout::emitRecord(Out, ScratchRecord, + AbbrCodes[FingerprintNodeLayout::Code], + *fingerprint); + } + + node->forEachDefIDependUpon([&](size_t defIDependOn) { + DependsOnDefNodeLayout::emitRecord(Out, ScratchRecord, + AbbrCodes[DependsOnDefNodeLayout::Code], + defIDependOn); + }); + }); +} + +void Serializer::addIdentifier(StringRef str) { + if (str.empty()) + return; + + decltype(IdentifierIDs)::iterator iter; + bool isNew; + std::tie(iter, isNew) = + IdentifierIDs.insert({str, LastIdentifierID + 1}); + + if (!isNew) + return; + + ++LastIdentifierID; + // Note that we use the string data stored in the StringMap. + IdentifiersToWrite.push_back(iter->getKey()); +} + +unsigned Serializer::getIdentifier(StringRef str) { + if (str.empty()) + return 0; + + auto iter = IdentifierIDs.find(str); + assert(iter != IdentifierIDs.end()); + assert(iter->second != 0); + return iter->second; +} + +void Serializer::writeFineGrainedDependencyGraph(llvm::raw_ostream &os, + const SourceFileDepGraph &g) { + writeFineGrainedDependencyGraph(g); + os.write(Buffer.data(), Buffer.size()); + os.flush(); +} + +bool swift::fine_grained_dependencies::writeFineGrainedDependencyGraph( + DiagnosticEngine &diags, StringRef path, + const SourceFileDepGraph &g) { + PrettyStackTraceStringAction stackTrace("saving fine-grained dependency graph", path); + return withOutputFile(diags, path, [&](llvm::raw_ostream &out) { + Serializer serializer; + serializer.writeFineGrainedDependencyGraph(out, g); + return false; + }); +} \ No newline at end of file diff --git a/lib/AST/FrontendSourceFileDepGraphFactory.cpp b/lib/AST/FrontendSourceFileDepGraphFactory.cpp index fb87b49304026..60bc24b6416ac 100644 --- a/lib/AST/FrontendSourceFileDepGraphFactory.cpp +++ b/lib/AST/FrontendSourceFileDepGraphFactory.cpp @@ -27,6 +27,7 @@ #include "swift/AST/ExistentialLayout.h" #include "swift/AST/FileSystem.h" #include "swift/AST/FineGrainedDependencies.h" +#include "swift/AST/FineGrainedDependencyFormat.h" #include "swift/AST/Module.h" #include "swift/AST/ModuleLoader.h" #include "swift/AST/NameLookup.h" @@ -291,13 +292,18 @@ bool fine_grained_dependencies::emitReferenceDependencies( SF, outputPath, depTracker, alsoEmitDotFile) .construct(); - const bool hadError = + bool hadError = false; + if (false) { + hadError = withOutputFile(diags, outputPath, [&](llvm::raw_pwrite_stream &out) { out << g.yamlProlog(SF->getASTContext().hadError()); llvm::yaml::Output yamlWriter(out); yamlWriter << g; return false; }); + } else { + hadError = writeFineGrainedDependencyGraph(diags, outputPath, g); + } // If path is stdout, cannot read it back, so check for "-" assert(outputPath == "-" || g.verifyReadsWhatIsWritten(outputPath)); diff --git a/lib/Driver/FineGrainedDependencyDriverGraph.cpp b/lib/Driver/FineGrainedDependencyDriverGraph.cpp index dd9d1460b1357..bc1cda3e359f7 100644 --- a/lib/Driver/FineGrainedDependencyDriverGraph.cpp +++ b/lib/Driver/FineGrainedDependencyDriverGraph.cpp @@ -15,6 +15,7 @@ #include "swift/AST/DiagnosticEngine.h" #include "swift/AST/DiagnosticsFrontend.h" #include "swift/AST/FileSystem.h" +#include "swift/Basic/PrettyStackTrace.h" #include "swift/Basic/ReferenceDependencyKeys.h" #include "swift/Basic/SourceManager.h" #include "swift/Basic/Statistic.h" @@ -65,6 +66,7 @@ ModuleDepGraph::Changes ModuleDepGraph::loadFromPath(const Job *Cmd, StringRef path, DiagnosticEngine &diags) { FrontendStatsTracer tracer(stats, "fine-grained-dependencies-loadFromPath"); + PrettyStackTraceStringAction stackTrace("loading fine-grained dependency graph", path); if (driverDotFileBasePath.empty()) { driverDotFileBasePath = path; From 82c0897b45e901a34fcb717809750c41c0a5cd75 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 7 Jun 2020 02:43:40 -0400 Subject: [PATCH 3/8] Dependencies: Fix uninitialized memory in SourceFileDepGraphNode --- include/swift/AST/FineGrainedDependencies.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/swift/AST/FineGrainedDependencies.h b/include/swift/AST/FineGrainedDependencies.h index 854d0e921fa76..eaea1dcb58c2c 100644 --- a/include/swift/AST/FineGrainedDependencies.h +++ b/include/swift/AST/FineGrainedDependencies.h @@ -689,7 +689,7 @@ class SourceFileDepGraphNode : public DepGraphNode { /// True iff a Decl exists for this node. /// If a provides and a depends in the existing system both have the same key, /// only one SourceFileDepGraphNode is emitted. - bool isProvides; + bool isProvides = false; friend ::llvm::yaml::MappingContextTraits; @@ -697,7 +697,7 @@ class SourceFileDepGraphNode : public DepGraphNode { public: /// When the driver imports a node create an uninitialized instance for /// deserializing. - SourceFileDepGraphNode() : DepGraphNode(), sequenceNumber(~0) {} + SourceFileDepGraphNode() : DepGraphNode() {} /// Used by the frontend to build nodes. SourceFileDepGraphNode(DependencyKey key, Optional fingerprint, From 4ff62ec27744027602931e0fd7d0ed903a17f194 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 7 Jun 2020 02:45:10 -0400 Subject: [PATCH 4/8] Dependencies: Implement SourceFileDepGraphNode::dump() --- include/swift/AST/FineGrainedDependencies.h | 3 +++ lib/AST/FineGrainedDependencies.cpp | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/swift/AST/FineGrainedDependencies.h b/include/swift/AST/FineGrainedDependencies.h index eaea1dcb58c2c..381b4443c0cb3 100644 --- a/include/swift/AST/FineGrainedDependencies.h +++ b/include/swift/AST/FineGrainedDependencies.h @@ -741,6 +741,9 @@ class SourceFileDepGraphNode : public DepGraphNode { : "somewhere else"); } + SWIFT_DEBUG_DUMP; + void dump(llvm::raw_ostream &os) const; + bool verify() const { DepGraphNode::verify(); assert(getIsProvides() || isDepends()); diff --git a/lib/AST/FineGrainedDependencies.cpp b/lib/AST/FineGrainedDependencies.cpp index ad553152e2b6b..8a90050e1b3bd 100644 --- a/lib/AST/FineGrainedDependencies.cpp +++ b/lib/AST/FineGrainedDependencies.cpp @@ -341,6 +341,19 @@ void DepGraphNode::dump(raw_ostream &os) const { llvm::errs() << "no fingerprint"; } +void SourceFileDepGraphNode::dump() const { + dump(llvm::errs()); +} + +void SourceFileDepGraphNode::dump(raw_ostream &os) const { + DepGraphNode::dump(os); + os << " sequence number: " << sequenceNumber; + os << " is provides: " << isProvides; + os << " depends on:"; + for (auto def : defsIDependUpon) + os << " " << def; +} + std::string DepGraphNode::humanReadableName(StringRef where) const { return getKey().humanReadableName() + From 4ff5dd4ed918ceed8b056de4d58ddb9741d63a40 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 9 Jun 2020 01:58:27 -0400 Subject: [PATCH 5/8] Dependencies: New swift-dependency-tool to convert between binary and YAML formats --- tools/CMakeLists.txt | 1 + tools/swift-dependency-tool/CMakeLists.txt | 10 ++ .../swift-dependency-tool.cpp | 123 ++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 tools/swift-dependency-tool/CMakeLists.txt create mode 100644 tools/swift-dependency-tool/swift-dependency-tool.cpp diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index ede02f0068bb7..2ace899dbdcde 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -17,6 +17,7 @@ endif() add_swift_tool_subdirectory(driver) add_swift_tool_subdirectory(sil-opt) +add_swift_tool_subdirectory(swift-dependency-tool) add_swift_tool_subdirectory(swift-ide-test) add_swift_tool_subdirectory(swift-remoteast-test) add_swift_tool_subdirectory(swift-demangle) diff --git a/tools/swift-dependency-tool/CMakeLists.txt b/tools/swift-dependency-tool/CMakeLists.txt new file mode 100644 index 0000000000000..5b4f1f86626c5 --- /dev/null +++ b/tools/swift-dependency-tool/CMakeLists.txt @@ -0,0 +1,10 @@ +add_swift_host_tool(swift-dependency-tool + swift-dependency-tool.cpp + SWIFT_COMPONENT tools +) +target_link_libraries(swift-dependency-tool + PRIVATE + swiftAST + swiftParse + swiftClangImporter) + diff --git a/tools/swift-dependency-tool/swift-dependency-tool.cpp b/tools/swift-dependency-tool/swift-dependency-tool.cpp new file mode 100644 index 0000000000000..fd60d63c85070 --- /dev/null +++ b/tools/swift-dependency-tool/swift-dependency-tool.cpp @@ -0,0 +1,123 @@ +//===--- swift-dependency-tool.cpp - Convert binary swiftdeps to YAML -----===// +// +// This source file is part of the Swift.org open source project +// +// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors +// Licensed under Apache License v2.0 with Runtime Library Exception +// +// See https://swift.org/LICENSE.txt for license information +// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors +// +//===----------------------------------------------------------------------===// + +#include "swift/AST/FileSystem.h" +#include "swift/AST/FineGrainedDependencies.h" +#include "swift/AST/DiagnosticEngine.h" +#include "swift/AST/FineGrainedDependencyFormat.h" +#include "swift/Basic/SourceManager.h" +#include "swift/Basic/LLVMInitialize.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/MemoryBuffer.h" +#include "llvm/Support/YAMLParser.h" + +using namespace swift; +using namespace fine_grained_dependencies; + +enum class ActionType : unsigned { + None, + BinaryToYAML, + YAMLToBinary +}; + +namespace options { + +static llvm::cl::OptionCategory Category("swift-dependency-tool Options"); + +static llvm::cl::opt +InputFilename("input-filename", + llvm::cl::desc("Name of the input file"), + llvm::cl::cat(Category)); + +static llvm::cl::opt +OutputFilename("output-filename", + llvm::cl::desc("Name of the output file"), + llvm::cl::cat(Category)); + +static llvm::cl::opt +Action(llvm::cl::desc("Mode:"), llvm::cl::init(ActionType::None), + llvm::cl::cat(Category), + llvm::cl::values( + clEnumValN(ActionType::BinaryToYAML, + "to-yaml", "Convert new binary .swiftdeps format to YAML"), + clEnumValN(ActionType::YAMLToBinary, + "from-yaml", "Convert YAML to new binary .swiftdeps format"))); + +} + +int main(int argc, char *argv[]) { + PROGRAM_START(argc, argv); + INITIALIZE_LLVM(); + + llvm::cl::HideUnrelatedOptions(options::Category); + llvm::cl::ParseCommandLineOptions(argc, argv, "Swift Dependency Tool\n"); + + SourceManager sourceMgr; + DiagnosticEngine diags(sourceMgr); + + switch (options::Action) { + case ActionType::None: { + llvm::errs() << "action required\n"; + llvm::cl::PrintHelpMessage(); + return 1; + } + + case ActionType::BinaryToYAML: { + auto fg = SourceFileDepGraph::loadFromPath(options::InputFilename); + if (!fg) { + llvm::errs() << "Failed to read dependency file\n"; + return 1; + } + + bool hadError = + withOutputFile(diags, options::OutputFilename, + [&](llvm::raw_pwrite_stream &out) { + out << fg->yamlProlog(/*hadError=*/false); + llvm::yaml::Output yamlWriter(out); + yamlWriter << *fg; + return false; + }); + + if (hadError) { + llvm::errs() << "Failed to write YAML swiftdeps\n"; + } + break; + } + + case ActionType::YAMLToBinary: { + auto bufferOrError = llvm::MemoryBuffer::getFile(options::InputFilename); + if (!bufferOrError) { + llvm::errs() << "Failed to read dependency file\n"; + return 1; + } + + auto &buffer = *bufferOrError.get(); + + SourceFileDepGraph fg; + llvm::yaml::Input yamlReader(llvm::MemoryBufferRef(buffer), nullptr); + yamlReader >> fg; + if (yamlReader.error()) { + llvm::errs() << "Failed to parse YAML swiftdeps\n"; + return 1; + } + + if (writeFineGrainedDependencyGraph(diags, options::OutputFilename, fg)) { + llvm::errs() << "Failed to write binary swiftdeps\n"; + return 1; + } + + break; + } + } + + return 0; +} From fe3f6b361679c1c3de4643fb8336b1a8b647537e Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 9 Jun 2020 17:33:28 -0400 Subject: [PATCH 6/8] Dependencies: Update tests for new binary format --- .../pch-bridging-header-deps-fine.swift | 4 +-- .../Inputs/chained-after-fine/main.swiftdeps | Bin 795 -> 408 bytes .../Inputs/chained-after-fine/other.swiftdeps | Bin 1002 -> 416 bytes .../chained-after-fine/yet-another.swiftdeps | Bin 815 -> 420 bytes .../chained-private-after-fine/main.swiftdeps | Bin 1162 -> 388 bytes .../other.swiftdeps | Bin 1002 -> 416 bytes .../yet-another.swiftdeps | Bin 815 -> 420 bytes .../main.swiftdeps | Bin 1421 -> 456 bytes .../other.swiftdeps | Bin 1002 -> 416 bytes .../yet-another.swiftdeps | Bin 815 -> 420 bytes .../main.swiftdeps | Bin 1848 -> 492 bytes .../other.swiftdeps | Bin 1009 -> 428 bytes .../yet-another.swiftdeps | Bin 815 -> 420 bytes .../crash.swiftdeps | Bin 595 -> 392 bytes .../main.swiftdeps | Bin 593 -> 392 bytes .../other.swiftdeps | Bin 595 -> 392 bytes .../fail-interface-hash-fine/bad.swiftdeps | Bin 951 -> 368 bytes .../depends-on-bad.swiftdeps | Bin 761 -> 368 bytes .../depends-on-main.swiftdeps | Bin 764 -> 368 bytes .../fail-interface-hash-fine/main.swiftdeps | Bin 955 -> 368 bytes .../fail-with-bad-deps-fine/bad.swiftdeps | Bin 1398 -> 424 bytes .../depends-on-bad.swiftdeps | Bin 1188 -> 396 bytes .../depends-on-main.swiftdeps | Bin 1185 -> 396 bytes .../fail-with-bad-deps-fine/main.swiftdeps | Bin 1402 -> 424 bytes .../malformed-after-fine/main.swiftdeps | Bin 795 -> 408 bytes .../malformed-after-fine/other.swiftdeps | Bin 594 -> 392 bytes .../main.swiftdeps | Bin 795 -> 408 bytes .../other.swiftdeps | Bin 594 -> 392 bytes .../does-change.swiftdeps | Bin 2015 -> 476 bytes .../does-not-change.swiftdeps | Bin 2019 -> 472 bytes .../mutual-with-swiftdeps-fine/main.swiftdeps | Bin 592 -> 392 bytes .../other.swiftdeps | Bin 594 -> 392 bytes .../one-way-depends-after-fine/main.swiftdeps | Bin 593 -> 392 bytes .../other.swiftdeps | Bin 1010 -> 420 bytes .../main.swiftdeps | Bin 803 -> 408 bytes .../other.swiftdeps | Bin 1010 -> 420 bytes .../main.swiftdeps | Bin 795 -> 408 bytes .../other.swiftdeps | Bin 596 -> 392 bytes .../main.swiftdeps | Bin 795 -> 408 bytes .../other.swiftdeps | Bin 1434 -> 472 bytes .../main.swiftdeps | Bin 592 -> 392 bytes .../other.swiftdeps | Bin 594 -> 392 bytes .../Inputs/private-after-fine/a.swiftdeps | Bin 1006 -> 416 bytes .../Inputs/private-after-fine/b.swiftdeps | Bin 1424 -> 456 bytes .../Inputs/private-after-fine/c.swiftdeps | Bin 1216 -> 436 bytes .../Inputs/private-after-fine/d.swiftdeps | Bin 795 -> 408 bytes .../Inputs/private-after-fine/e.swiftdeps | Bin 795 -> 408 bytes .../Inputs/private-after-fine/f.swiftdeps | Bin 1214 -> 436 bytes .../Inputs/private-after-fine/g.swiftdeps | Bin 1216 -> 436 bytes .../Inputs/update-dependencies-bad.py | 12 ++++++-- .../Inputs/update-dependencies.py | 12 ++++++-- .../chained-additional-kinds-fine.swift | 8 +++--- .../Dependencies/chained-after-fine.swift | 6 ++-- test/Driver/Dependencies/chained-fine.swift | 12 ++++---- .../chained-private-after-fine.swift | 6 ++-- .../chained-private-after-multiple-fine.swift | 6 ++-- ...-after-multiple-nominal-members-fine.swift | 6 ++-- .../Dependencies/chained-private-fine.swift | 6 ++-- .../check-interface-implementation-fine.swift | 6 ++-- .../Dependencies/crash-added-fine.swift | 10 +++---- test/Driver/Dependencies/crash-new-fine.swift | 16 +++++------ .../Dependencies/crash-simple-fine.swift | 6 ++-- .../dependencies-preservation-fine.swift | 2 +- ...iver-show-incremental-arguments-fine.swift | 6 ++-- ...cremental-conflicting-arguments-fine.swift | 10 +++---- .../driver-show-incremental-inputs-fine.swift | 4 +-- ...iver-show-incremental-malformed-fine.swift | 12 ++++---- .../driver-show-incremental-mutual-fine.swift | 6 ++-- ...-show-incremental-swift-version-fine.swift | 6 ++-- .../Driver/Dependencies/fail-added-fine.swift | 8 +++--- .../Dependencies/fail-chained-fine.swift | 18 ++++++------ .../fail-interface-hash-fine.swift | 6 ++-- test/Driver/Dependencies/fail-new-fine.swift | 16 +++++------ .../Dependencies/fail-simple-fine.swift | 6 ++-- .../fail-with-bad-deps-fine.swift | 10 +++---- .../Driver/Dependencies/file-added-fine.swift | 6 ++-- .../Dependencies/independent-fine.swift | 16 +++++------ .../independent-half-dirty-fine.swift | 6 ++-- .../independent-parseable-fine.swift | 12 ++++---- .../malformed-but-valid-yaml-fine.swift | 16 +++++------ test/Driver/Dependencies/malformed-fine.swift | 16 +++++------ test/Driver/Dependencies/mutual-fine.swift | 8 +++--- .../mutual-interface-hash-fine.swift | 12 ++++---- .../Dependencies/nominal-members-fine.swift | 10 +++---- .../one-way-depends-after-fine.swift | 18 ++++++------ .../one-way-depends-before-fine.swift | 18 ++++++------ .../one-way-external-delete-fine.swift | 10 +++---- .../Dependencies/one-way-external-fine.swift | 12 ++++---- test/Driver/Dependencies/one-way-fine.swift | 26 +++++++++--------- .../one-way-merge-module-fine.swift | 4 +-- .../Dependencies/one-way-parallel-fine.swift | 4 +-- .../Dependencies/one-way-parseable-fine.swift | 8 +++--- .../one-way-provides-after-fine.swift | 16 +++++------ .../one-way-provides-before-fine.swift | 16 +++++------ .../one-way-while-editing-fine.swift | 4 +-- .../Dependencies/private-after-fine.swift | 10 +++---- test/Driver/Dependencies/private-fine.swift | 14 +++++----- .../Inputs/chained-after-fine/main.swiftdeps | Bin 795 -> 408 bytes .../Inputs/chained-after-fine/other.swiftdeps | Bin 1002 -> 416 bytes .../chained-after-fine/yet-another.swiftdeps | Bin 815 -> 420 bytes .../chained-private-after-fine/main.swiftdeps | Bin 1162 -> 388 bytes .../other.swiftdeps | Bin 1002 -> 416 bytes .../yet-another.swiftdeps | Bin 815 -> 420 bytes .../main.swiftdeps | Bin 1421 -> 456 bytes .../other.swiftdeps | Bin 1002 -> 416 bytes .../yet-another.swiftdeps | Bin 815 -> 420 bytes .../main.swiftdeps | Bin 1848 -> 492 bytes .../other.swiftdeps | Bin 1009 -> 428 bytes .../yet-another.swiftdeps | Bin 815 -> 420 bytes .../crash.swiftdeps | Bin 595 -> 392 bytes .../main.swiftdeps | Bin 593 -> 392 bytes .../other.swiftdeps | Bin 595 -> 392 bytes .../fail-interface-hash-fine/bad.swiftdeps | Bin 951 -> 368 bytes .../depends-on-bad.swiftdeps | Bin 761 -> 368 bytes .../depends-on-main.swiftdeps | Bin 764 -> 368 bytes .../fail-interface-hash-fine/main.swiftdeps | Bin 955 -> 368 bytes .../fail-with-bad-deps-fine/bad.swiftdeps | Bin 1398 -> 424 bytes .../depends-on-bad.swiftdeps | Bin 1188 -> 396 bytes .../depends-on-main.swiftdeps | Bin 1185 -> 396 bytes .../fail-with-bad-deps-fine/main.swiftdeps | Bin 1402 -> 424 bytes .../malformed-after-fine/main.swiftdeps | Bin 795 -> 408 bytes .../malformed-after-fine/other.swiftdeps | Bin 594 -> 392 bytes .../main.swiftdeps | Bin 795 -> 408 bytes .../other.swiftdeps | Bin 594 -> 392 bytes .../does-change.swiftdeps | Bin 2015 -> 476 bytes .../does-not-change.swiftdeps | Bin 2019 -> 472 bytes .../mutual-with-swiftdeps-fine/main.swiftdeps | Bin 592 -> 392 bytes .../other.swiftdeps | Bin 594 -> 392 bytes .../one-way-depends-after-fine/main.swiftdeps | Bin 593 -> 392 bytes .../other.swiftdeps | Bin 1010 -> 420 bytes .../main.swiftdeps | Bin 803 -> 408 bytes .../other.swiftdeps | Bin 1010 -> 420 bytes .../main.swiftdeps | Bin 795 -> 408 bytes .../other.swiftdeps | Bin 596 -> 392 bytes .../main.swiftdeps | Bin 795 -> 408 bytes .../other.swiftdeps | Bin 1434 -> 472 bytes .../main.swiftdeps | Bin 592 -> 392 bytes .../other.swiftdeps | Bin 594 -> 392 bytes .../Inputs/private-after-fine/a.swiftdeps | Bin 1006 -> 416 bytes .../Inputs/private-after-fine/b.swiftdeps | Bin 1424 -> 456 bytes .../Inputs/private-after-fine/c.swiftdeps | Bin 1216 -> 436 bytes .../Inputs/private-after-fine/d.swiftdeps | Bin 795 -> 408 bytes .../Inputs/private-after-fine/e.swiftdeps | Bin 795 -> 408 bytes .../Inputs/private-after-fine/f.swiftdeps | Bin 1214 -> 436 bytes .../Inputs/private-after-fine/g.swiftdeps | Bin 1216 -> 436 bytes .../Inputs/update-dependencies-bad.py | 12 ++++++-- .../Inputs/update-dependencies.py | 12 ++++++-- .../chained-additional-kinds-fine.swift | 8 +++--- .../chained-after-fine.swift | 6 ++-- .../PrivateDependencies/chained-fine.swift | 12 ++++---- .../chained-private-after-fine.swift | 6 ++-- .../chained-private-after-multiple-fine.swift | 6 ++-- ...-after-multiple-nominal-members-fine.swift | 6 ++-- .../chained-private-fine.swift | 6 ++-- .../check-interface-implementation-fine.swift | 6 ++-- .../crash-added-fine.swift | 10 +++---- .../PrivateDependencies/crash-new-fine.swift | 16 +++++------ .../crash-simple-fine.swift | 6 ++-- .../dependencies-preservation-fine.swift | 2 +- ...iver-show-incremental-arguments-fine.swift | 4 +-- ...cremental-conflicting-arguments-fine.swift | 8 +++--- .../driver-show-incremental-inputs-fine.swift | 4 +-- ...iver-show-incremental-malformed-fine.swift | 10 +++---- .../driver-show-incremental-mutual-fine.swift | 6 ++-- ...-show-incremental-swift-version-fine.swift | 4 +-- .../PrivateDependencies/fail-added-fine.swift | 8 +++--- .../fail-chained-fine.swift | 18 ++++++------ .../fail-interface-hash-fine.swift | 6 ++-- .../PrivateDependencies/fail-new-fine.swift | 16 +++++------ .../fail-simple-fine.swift | 6 ++-- .../fail-with-bad-deps-fine.swift | 10 +++---- .../PrivateDependencies/file-added-fine.swift | 6 ++-- .../independent-fine.swift | 16 +++++------ .../independent-half-dirty-fine.swift | 6 ++-- .../independent-parseable-fine.swift | 12 ++++---- .../malformed-but-valid-yaml-fine.swift | 16 +++++------ .../PrivateDependencies/malformed-fine.swift | 16 +++++------ .../PrivateDependencies/mutual-fine.swift | 8 +++--- .../mutual-interface-hash-fine.swift | 12 ++++---- .../nominal-members-fine.swift | 10 +++---- .../one-way-depends-after-fine.swift | 18 ++++++------ .../one-way-depends-before-fine.swift | 18 ++++++------ .../one-way-external-delete-fine.swift | 10 +++---- .../one-way-external-fine.swift | 12 ++++---- .../PrivateDependencies/one-way-fine.swift | 26 +++++++++--------- .../one-way-merge-module-fine.swift | 4 +-- .../one-way-parallel-fine.swift | 4 +-- .../one-way-parseable-fine.swift | 8 +++--- .../one-way-provides-after-fine.swift | 16 +++++------ .../one-way-provides-before-fine.swift | 16 +++++------ .../one-way-while-editing-fine.swift | 4 +-- .../private-after-fine.swift | 10 +++---- .../PrivateDependencies/private-fine.swift | 14 +++++----- test/Frontend/dependencies-fine.swift | 6 ++-- .../dependencies-preservation-fine.swift | 4 +-- .../Dependencies/private-function-fine.swift | 8 +++--- .../private-function-return-type-fine.swift | 8 +++--- .../private-protocol-conformer-ext-fine.swift | 4 +-- .../private-protocol-conformer-fine.swift | 8 +++--- .../private-struct-member-fine.swift | 8 +++--- .../Dependencies/private-subscript-fine.swift | 8 +++--- .../Dependencies/private-typealias-fine.swift | 8 +++--- .../Dependencies/private-var-fine.swift | 2 +- ...nce-dependencies-dynamic-lookup-fine.swift | 8 +++--- .../reference-dependencies-fine.swift | 4 +-- .../reference-dependencies-members-fine.swift | 8 +++--- .../private-function-fine.swift | 4 +-- .../private-function-return-type-fine.swift | 4 +-- .../private-protocol-conformer-ext-fine.swift | 4 +-- .../private-protocol-conformer-fine.swift | 4 +-- .../private-struct-member-fine.swift | 4 +-- .../private-subscript-fine.swift | 4 +-- .../private-typealias-fine.swift | 4 +-- .../private-var-fine.swift | 2 +- ...nce-dependencies-dynamic-lookup-fine.swift | 4 +-- .../reference-dependencies-fine.swift | 4 +-- .../reference-dependencies-members-fine.swift | 4 +-- test/Inputs/process_fine_grained_swiftdeps.sh | 4 ++- ...ine_grained_swiftdeps_with_fingerprints.sh | 4 ++- .../added_method-type-fingerprints.swift | 4 +-- ...s_private_property-type-fingerprints.swift | 4 +-- ...ate_class_property-type-fingerprints.swift | 4 +-- ...m_private_property-type-fingerprints.swift | 4 +-- ...vate_enum_property-type-fingerprints.swift | 4 +-- ...ded_private_method-type-fingerprints.swift | 4 +-- ...method_value_types-type-fingerprints.swift | 4 +-- ...te_protocol_method-type-fingerprints.swift | 4 +-- ..._protocol_property-type-fingerprints.swift | 4 +-- ...t_private_property-type-fingerprints.swift | 4 +-- ...te_struct_property-type-fingerprints.swift | 4 +-- ...edited_method_body-type-fingerprints.swift | 4 +-- ...ed_property_getter-type-fingerprints.swift | 4 +-- test/lit.cfg | 2 ++ 233 files changed, 593 insertions(+), 559 deletions(-) diff --git a/test/ClangImporter/pch-bridging-header-deps-fine.swift b/test/ClangImporter/pch-bridging-header-deps-fine.swift index 670ba23db8d3a..4f21828ba3d32 100644 --- a/test/ClangImporter/pch-bridging-header-deps-fine.swift +++ b/test/ClangImporter/pch-bridging-header-deps-fine.swift @@ -10,13 +10,13 @@ // RUN: %target-swift-frontend -emit-pch -o %t.pch %/S/Inputs/chained-unit-test-bridging-header-to-pch.h // RUN: %target-swift-frontend -module-name test -c -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -primary-file %s -import-objc-header %t.pch // RUN: %FileCheck --check-prefix CHECK-DEPS %s < %t.d -// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck --check-prefix CHECK-SWIFTDEPS --enable-yaml-compatibility %s < %t-processed.swiftdeps // RUN: %FileCheck --check-prefix CHECK-SWIFTDEPS2 --enable-yaml-compatibility %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -module-name test -c -emit-dependencies-path %t.persistent.d -emit-reference-dependencies-path %t.persistent.swiftdeps -primary-file %s -import-objc-header %/S/Inputs/chained-unit-test-bridging-header-to-pch.h -pch-output-dir %t/pch // RUN: %FileCheck --check-prefix CHECK-DEPS %s < %t.persistent.d -// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.persistent.swiftdeps >%t-processed.persistent.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.persistent.swiftdeps %t-processed.persistent.swiftdeps // RUN: %FileCheck --check-prefix CHECK-SWIFTDEPS --enable-yaml-compatibility %s < %t-processed.persistent.swiftdeps // RUN: %FileCheck --check-prefix CHECK-SWIFTDEPS2 --enable-yaml-compatibility %s < %t-processed.persistent.swiftdeps diff --git a/test/Driver/Dependencies/Inputs/chained-after-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/chained-after-fine/main.swiftdeps index ab68f2a75146fd48893ba594c68a57f7419ac818..c00e208418ef20355cadfc0bc66faf469376d166 100644 GIT binary patch literal 408 zcmaiuy-&hG7{=e8d@jV8xSxqJ9M{r9X@dy^R&c_^gv8l?CYXpu46dXyGB_|YICOAS zrw$C{aOlA3U*gQ*ONg!xcf<4io?qTp`=Tr505||-rH@5ov5DXbVe7E?Cip~@8iyx* zN|Z5SWBkSPXeIbpC{HXzSVZ_#sLvK#2z3_9VxV#bUx%LY;?vjVa1P9uXxHJpOYu+a*MC8exs5-vSP<08G4@c%uc?UPp|c z661O=^(pP|=5rb8y_qLif8&GhV=s81L;rrzyX{k>tSg>Bq{U9>@|*@n#k5^htGY7X za;|-7|x#?gVbd(G0_> Y8;(~qO}lQoSpw<87X6n^1Ef$5KiOq^3jhEB literal 795 zcmd5)O-sZu6ukFW1U&4irCYb9^ehX4EM7c`hkQ(yuxS#LwCcaNO)C_{gSZECNFFaU z@4cDih8&eae)e=a1R2XL&-09GeX;_f%LvKI1s`)TuZuFGTf$`zcJLfWrSa(Ps03CZ z4GuhRpvpveN%+~2{$h$m-FN1jPVUec8ctE{k2 z6#XzOxRxos)97I$jmnzTk&u7k%>E~5{$xzF?g1n8s`Q$lgr=I`UbyqH!J&hr zI(1-Z9u6HC{Y#t~e1z!gaPM%=@0@!Z&8xN`0#E=*3m;Kzk}0DxlC__GV|2=Lwc|57 zLuG0m?zNdIsT3oV|l(G|T=POsyZ@-vs8 zpA=koLby~_THBz74lF36#~X?MM`^OP(wtS9VC*A$G&AZYzsX9A^EHn2Z$ZxN>h08LSBz diff --git a/test/Driver/Dependencies/Inputs/chained-after-fine/yet-another.swiftdeps b/test/Driver/Dependencies/Inputs/chained-after-fine/yet-another.swiftdeps index 463b4dfae1c71b24c0e092e4bbd62c902e1c9f80..becd8c3d80bce7e4a30b5d30a8a7b4d72e0a1e48 100644 GIT binary patch literal 420 zcmaiwy-&hW6vbbk^0gRa!d?<%c)XUjv?XoAfEAoDF(F~L_9J2<7$6XxNM&SjU}SLU z;HXX=7|6q+1EYV5GlQ29U46-Y!#%%q?#->$FPmH%A&L-6aUaXrB2z|VOg2IOjnOG9 zRE|&S42u&?Ch)V>$(qrxK$u#9kPy=ulb$WIWYRnkCRli3Qp6~9DzzsP26S$b7z?pg zh_JW`=mL`&Tb*wm7Kt!fGiedf4Rj$apdl7RMx(!sYP|p`SVNE@=~qCxD}+qg8N1^p zFTaine}?tjqy0}VdzeWlx%X-YgZvGJnxnQq;D=tX-|lvJy{L+=H{|n;M(cw2b){@O zWx3=C{El-}(^nPWyLJh9(^-Tbyn$$Ux`P|9SL|=IT<^ZW)!=U0o!#yzkF7)!;p(1@ oY}-?{lBwyArW>v-8@6d0rfb6t#gNTX3Zulq4*i!+1)dlQ72F9*<)%uDv4J%;CIy(>sA1)#1G}2PH8A z!CMqz0aX;xwIIF$!VHOz1!A>|R053)B4bAk9LR)Mbg6$=ZIEdF1a1}W&{;PWpBVsn zT^4n@7UjBaLSDxWB$y)L+q0KC`FrV);0udIM2oCkK=h5^ zOTy-Ib+t`cEFf$xjiullq*x}nPjp}M;IE@v&!H8gKFZkiD?p|VVB*ch_Ci{C^%%V* zrQ3t}r*gEPQj^MiHAPVV#)0Nz-+iDHXEg2)2egzg>b5hX*+!#vP2G}N?)1uq)1F3m zzFzU%Et;;=wHapBG{9Y_Kgf@_CAM=vMuz`7+d{M3QWby>`VvVX)mRL=jyoJV_)7wb X^bY;AI3zLvVGKNR2+&r*!!*DT23T?j literal 1162 zcmchWOH0Hs6ovQw6&GC0s--h_)wK)=GPu!=xJa9mAx!fyNvr;Q`-o5|1!qRhBDo~z z-rSFq+|XWXq({g4g;SR&X__XiX%2?NmkCiyCwvaUFiukQatf!}o7UCX%Lb3mbdnNyrz*d8Cm!p_|qPX4DjKQi%BrrR~9tB``R59n~Y XMeBc(jSVlnDbD2(tno;)EK9xs=n*jj diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-fine/other.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-fine/other.swiftdeps index fdebaf57ebfb4aab27e919a0a84209c4901c0cbf..536f71123e364ba2a263dc74c7f297350aab94c4 100644 GIT binary patch literal 416 zcmaiuy-&hW6vb~ZAZ1Zw;$9PDc)XTUumutZtl)%+35m0%9}x#JKyW3Mk->qH!J&hr zI(1-Z9u6HC{Y#t~e1z!gaPM%=@0@!Z&8xN`0#E=*3m;Kzk}0DxlC__GV|2=Lwc|57 zLuG0m?zNdIsT3oV|l(G|T=POsyZ@-vs8 zpA=koLby~_THBz74lF36#~X?MM`^OP(wtS9VC*A$G&AZYzsX9A^EHn2Z$ZxN>h08LSBz diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-fine/yet-another.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-fine/yet-another.swiftdeps index 6c6e6bd8f844a45e7b68158269c57185264c20db..a9ff90ae9f81aa286a0c7c93c86eca08631c872e 100644 GIT binary patch literal 420 zcmaiwzfZzI9L2Av{924LVK0d>9M{s8QfdLqu>d!P5d-(0nJ)ew>hQG`%J_*h0ZnQ$6mvI(+poKASI ze0)ZySRP|ChL^8S)|`F?(!>UYgqTjb@@$hOS7w1U#?lK{=A433u0D}4pfj69Sc>f2 z9Lt-4E-;z$)x|bplQ|}9t}Ft&0Ts#u8e%!*bpF>-spSBLXb3hm{Te89jgSR9V{fz+ z)z=Xb&#`fPwEroj4^zpw@Low_u)pD=#zWg5h(p%vx4RwD$m_DlhGMo}Z(fSNp_QCg zNiDP_amTfE%hxrZxgLRRGL6t98^}(lJGf!Je1F^JvHSkkgMTaDIqi<-He+#wD|;$Z oi@M=6-}Fq)R1LGpJjb;PrlFn|EZxh($ literal 815 zcmd5)J#WJx6x{tQkUC_tWjnUqc&;LKiMq5))d8C$L9rhcaN7L)`h!Z5q7G3zlmVXL z?!g^*$F_k(kcg0@6J`z<|WF(Nwcnmb16{ zNV%ZSg@<`NOhW$3o8ENjL7sc1X}*!M|71}1lR>}ohjg!qcR}y%i7EOqv{~~K8eHWj SBx+mm>5|YbFRgsGLlw(>7LY=~+48TW-ppeZ(Ex31`ZXZi1u*f=#P&i- zdG)AtPW0=;_@{7ukQS4|dp%9i{>B6C$ASAGjh*|^;C3kKMXg{vV=32abuJ}WSB+lZ zP|AH-+UNRO)zwtjv22R0m;t!y4Ti;0RAM`KBh>J}Dv_vK9Z>-2MLC>LI1@=A^_T*^ zileKVRk3uVs#&h#>WXdj6wfp9brmjEjgQW3 zmB1)u-eMIFq)G>Ll2u=V%5;X^fnqX=u9`J?;0Vxkv1R^U$so}BK_!)5qqDAibuVQE zX;E^*>HN0jaxQ5u=2b3eS#U~beDL!4)}pR()ixYm=a>&>fzsdKp+zm8tkDa2f!P$u z6ezq70_7u|k8uUp_8fnen#R`Hpbji3qlX^>{zZO@vHXyWGNVnSG^-=&>8(QgjwtwZ zeBh{IVk;e$dp3rXUlr$9qH!J&hr zI(1-Z9u6HC{Y#t~e1z!gaPM%=@0@!Z&8xN`0#E=*3m;Kzk}0DxlC__GV|2=Lwc|57 zLuG0m?zNdIsT3oV|l(G|T=POsyZ@-vs8 zpA=koLby~_THBz74lF36#~X?MM`^OP(wtS9VC*A$G&AZYzsX9A^EHn2Z$ZxN>h08LSBz diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-fine/yet-another.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-fine/yet-another.swiftdeps index 045438f5550d62b58e0fa545b666ddce5b04c61e..f49792b949a856c54fd6a0492089de6fee17b9b5 100644 GIT binary patch literal 420 zcmaiwy-&hG7{;%sd@aV9u$RObj%#Ua`D(&|6`U|JAz>DJ*NBN=fMDE6Wn^$*WN_%< zs7@Ui$l=g|(Z9r*!IuzSz2t6qp5ODlZ?0OqYDjT}C_*SEeJn$pOa%=w*?8$UL8l^9 zK0c!}tWGeQz$;cKYeBy}WoiRLd`xFTd$!3^Xmd}QVC6+)#)1TW+aMmWlu+z oVKQ#Ciw1XdC6;rFrd}vnF0(9F)GeLIFp3=P(0|!T3WmV>0iH#EcK`qY literal 815 zcmd5)J#WJx6x{tQkUC_tWhYi0d#)mNiMq5))d9nipx6%=aN7L)`h!ZAq7G3zlmVXL z?%*AF$99?!A1ogh$U zcO8UZKs9+-#l<&3m|^2{fmp2qm3WHDpPJlYum diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members-fine/main.swiftdeps index ad8a56b02c2e39ae196ce401911ca08ccc923431..b43c0bf3f82f1edfac625119f095bf94c8d89b46 100644 GIT binary patch literal 492 zcmah_J4?e*6h66qq=JZuf@1`c-rmGCjfpKd)M#C-P$+b6o>0LmR;pu(9XmL5bm)-5 zQJpe4l&eFBj{Xwo4xS=DHivu9;d}9M4lA{~kO5!-APUdpiA4vTO$eQZ*+Jh!*G z&xS643D{@?9AjtV^~O^E zp+}_yVw|od--Na0g-lv_DlZVEKkz~Qx)oeWUH`JvI&VwHwyt=7SISnajT0#_G}Cs? ze8H8aFP*EG0$mGy$D`=YECHO^t@d_j9^&~I9mMcnJ9AKT8o#^!XTND=1OR*P$9aP@ zl?GBy1J~4vqI%#49fKNvwh++T$ literal 1848 zcmd6nJ#T|B5QcYt#Yr8q016>MlDUf1CF;^HRR@F5krixH8`AXOmk(EpL{Ul_q%eSm z-aGrbd(RKBa+Rgle3ayVOkaAa*w*ub=FQw z7pou%!gR%AWYIc|;$)4hG|WGbsacwlTl>m=@AQ*^rcX818=Z! zVd+BTLhM2U@2!j*i)ifWN?kQHwJYGvbphO}AR&c_^goN4B*G5bP0|Zy{WMpt)WN_%< zs7?$FnK&y0u|9v*rMszfWsSrGjTJbgSle7 z4zO~8?7M@VPbs;dkYmz&DS?FjEe2|j&7i0B{Z6;pZYg#qt5LtNq^i~Wl@i!y-u3c^ z<*CY+^Rk5?YX*LUVv&{i0NTASbp63~FnvInhsth29J-+urzxK+=Y6yot*wzbNs|N49Jt&DI zkOzk%PN2#}^fecs0Aaht+XS&#j8wxlPKW?DKBF(ftE!_!7ZR*iW{2MSuIzwij8P#e zFBzA#E{WLk}HKWgoXik5SVz7$jxMfL&XZwoO1 diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members-fine/yet-another.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members-fine/yet-another.swiftdeps index c279ebaf043ab71881b565d8b587b1a049709a67..fd1bac5a8aeb1a94210f1546839964987ba43fff 100644 GIT binary patch literal 420 zcmaiwy-&hG7{;%sd@aV9u$RObj%#UaDIW;~R&c_^goN3)*G5bP0|etnDkFmfBZET+ zM|JAJKn{lvjQ%Cg48DZu>Lqu>^ZcIYeRK83RZB=BL=i#>;bR$@WXfrT$;QvVaXRI> z>hT$!VR?ed1YW*6S#$d3OH&gN5@0&x%Ckw9T$%gQ1WPYm2{{F&T7M#ePv<6yuoRiO z5X&2%E-;z#)x|bpk`R+MR~A0qfC^s|db8Orm?SBgC!&EXZyw_3~>~FZJ_0aK#;>hg}I=!xF?8s`I5sYVoQjN6nlYvJMu2ZKLMS=Hc`BxHlqlM{oM&$a$6+TGJUVld0uqpU z3p^~K5(BuN@oxY(W+8Yst}t-l#%7(eE{UJA9M$9Bo=X7K<^*!!2*gWYp^9RWKCY< zk@QKOPY(-jn1uY5H`*%DfPn>RFy2VWe==zH?FWN?Y>|WkD>z|dLgH*`dl3gU)Zj|ajtmZr3=SO} z)u{smIUG7L`jh) z{KI*b8mkyA==wxvb6Wsj-wm%y;i|^#SUG==+=%*v+5blc6~c= QtIYQNuAABXA1BYiH}PkBVgLXD literal 595 zcmd6jK~KaW5QXpk6(k<^M6+$Qb$d3Oc-eUIWIRmav65{8fv)=RrL-nJ8xL}T$?&~_ z_iorx8}PHIbVzpH7o78ghT&u-LRT=x*#%#7F|Ug@vRle!4|ehbM?K)l+pCsXK?)8c zZcuF^ydv=f2%8$88)COxrG`dqgp3JK;jIiGT15#LGN!aS!#khGE^J%laHnpms`|ry zUALlA4ao-7sz%73vMS(xf)O}PV-KH%``ngL;qd_uMm{@hI`+cYYrfH8wH4MMML*3B c{wkEw4H#h}MQu%fG1>hW$yC2erYy_i8^4aC6aWAK diff --git a/test/Driver/Dependencies/Inputs/crash-simple-with-swiftdeps-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/crash-simple-with-swiftdeps-fine/main.swiftdeps index f8db87488755d62b8b8c8adc26a661cdeee5215f..90c08952efcd808f61a5907c938fc769594617d4 100644 GIT binary patch literal 392 zcma)$F;Bu!6oqe}g0K){;{HsG;qh8Zi!G8cU%+XqOcfz&rjP%(q5B@SJ~=v0qPv*H=Tc6~c= QE5i2tj+@H;kHa(Y4a|pm^#A|> literal 593 zcmd6jKTpFj5XJX=ijx>RIcg$EXy&RCOU1&37##b#vKs%vb_#rZ5+_KR5d$91r@P;? z@7^7qv<15aK3$S-`+_l6@L@PRiP#lHjIQ{allfe=mEDpqF}g7bob-U_;BH!C1$p!k zX@hE;5EK_bfN)dcb3^QQtJHFXjgZJpvz75ft0duLrj)i91RthX7qqQ$cu@Des`|rY zUALlA4VMjgs~RDDo>dX=BdoxAG(Ey3+~=}{icd#)Soz|e?dX;0Eq8QWw~FgPDU9<1 bf8~ks0}O29NjsZ=B>ES|RKGH&EX(2>ESI4? diff --git a/test/Driver/Dependencies/Inputs/crash-simple-with-swiftdeps-fine/other.swiftdeps b/test/Driver/Dependencies/Inputs/crash-simple-with-swiftdeps-fine/other.swiftdeps index 08e363ec1de1ab0771796bb6a7bbc8034e6ed90b..9f9f8bff887d6da1f70862f2c4888dea839418b3 100644 GIT binary patch literal 392 zcma)$u}{K46vkgqL0Ht7xSxqJ9M@7>Y>|WkD>z|dLgH*`dl3gQl;BEEMg|8)28Rxg z>ePXO91a~A{Y#t~JYsZqcyIW=-}k*&Z(O#N3;+dyE#-ZlIAknng2;;JUIiVCeD&~@ zPLMW2WF)s(94!U?r<+bD>YUIzsBR&|^WRQmsFdh|{S<5~LM&9Y}O+x6|h QEi>Em+iq(6f1Er6-}n7`a{vGU literal 595 zcmd6jKTpIk48`|;3QG((rMgzoa-GphEGHHw#E>R0M|7H^@zQkNXF`ZfcHPNo#3myWbivn@Oy^=*H%q$2=!T$hv>l#;yIPGEl+i<_ z4Qe?d7^!{$<;KG2hS=>^Da#%kA(2aO2zmUlCTaLMW5)6s!H03|!qz1Ycji_WMSHj} z%UTttlDdMdO{H`zXH~@e09H5+eTy&(_j6gp#K#ACuzvQA8+svnojW$JYsK|PDGbvF be`QMVJM`crlXX15Nc2CPDSqWlp6A&&<@TaB diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash-fine/bad.swiftdeps b/test/Driver/Dependencies/Inputs/fail-interface-hash-fine/bad.swiftdeps index 527f7825b3eaf1653d73adf5c2d9ddc52c7ea3e9..36923733d1d0f303fa6512e9086ef7c7309191ee 100644 GIT binary patch literal 368 zcmX|-zfZzY5XY}qKo~T}#Qm8V!{fCSB#@XeU&X-Kb9kFb)d2_|Qa z(wSE(dTz(zluhpfblOgSxbAS=hvAy(e+-f-z?!Z@$MyOHm;Q&4+}ofnO9CV!9ehjx HGRpn}`#)|0 literal 951 zcmchUF>Avx5QTUDih~ZBY}|D7Tmpp>x?~C+Wa%l0*e6Aj-S*$tmR&Hk?vk_`q(k@a z-F@60?F=J7c`-bS`ZCM&JQGc`w+f-kh;lmPV+_V~Hms^CobF&dFR?QXUcBv%!YmZQ zLB@sDaD>-FehH)0D13rVC6pWvMzOebXxZT(~&aOuDj z`>w6whjf`r6m)ocgafOCvs}@Uw)C1(Cd{*kxoz~_=yfad)-`CsQAA@obtL*f{QEWh otLUS3&*;(2I5%E*a{ac*?HWn>w2)o{16snOmsdIV>qs*Ac4e$0V_CRVnX69&})JN7;11OCnJLcBZET+ zM|JAJKn{lvjQ%Cg41R>ja5p^f`#!l`t$y1yQUC$~_KdGZZ5UsTm zbL3OKyxuGv9wJ|9d#=QqD9Mxv&bfEd%^`6*J4*YJv$4a@P<;o$;G#Ym|%qtbjtxh?A-Z9y> z*C}3j#eyf>E~jnk7{HZ}vgi8!Uc2Sy{Edu=Pgx9r5G0a-)mRML((4Z-{UbtRe~Wf3 J0T3r0`~jF1a9;ob literal 761 zcmc&yv1-FG5Z(0^2OTomq!~SzK%s;#ok9lLdI}=4r0Qh1{rk$Y3x?vUfohPByZ7F4 z@AN=N<4|3r%#WgRFRH2%(%O?(;6@Ntbi>yaOy_2tYUXgh*$=V9(OA4jKN^JvC^?`@ zE2wb^QOoWJ(D|JBTp@P5h3aIF6_H3Gz$x~wm8#|sqf^dsL2Ki#h#_Y6nbJc0IQL+@ z4{#k$L*F9i^1e_MG(SHT$+zHLLuWeBrIZXWL-5i+#bMIAmj!*W=;4w~#=Fvy=pTG| m-16a1HY6WjFv2c#-SY$Fy%*JA8$E1IvawGsEko3GEyOoY2+cNibI2M_?Tt9{L5n~#-G@9-^2i>(%CSWlg0qLgP(YkrG5IwHF>rF|~P&Mr>yzG*?p0 zkWbX&YMroognX&2nG`FcR3=4;W~fB8?WoqXWTj|GGBy1RaC`?~(9P%!=Pds|?`WUZG?M&F1I_2I_rwNnKj`*+R>~Dk#~rXtqj7u9yi%du>Xh?m9fNIr zo#MGyEO>6);gr>n037$x^_`&SKeW1jE?Bn_3P4W+tWjzQu$o9f+x2>Vm;Q*5+S{Nl JO97A@;19}zaa{la literal 764 zcmc&yJ!``-5Z(1F4mxDANi%vbfkFvgI+YHJ^%O*8N!7`2`|m5uDj15V2C6|i?%sR% zr8_zrhvpJxeiTi6(KL;a)}FiqcY>&)E52r9K3C&Zx0uV#evCbi#^O2p$tYBy7g n{njA7EF6DHW&*e$=ny!j&gYo~{;RyH=OrDce=ZH4#-l4{Pu diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/fail-interface-hash-fine/main.swiftdeps index 43ededaf30de400d907f02df19537e9ff4ce3783..dad602b6f208f13817c9a1b9968359373b658a2b 100644 GIT binary patch literal 368 zcmX|-F;Buk7>2)o6oiEs6ZbPQhT~ca5=cxKu!0jNCM3=RZ4*oc0|r)dGBP+YGB|W_ zRHqIM&Ee32(O=@s;75oIcf<3(?~}{b>bFfT2_OLAK>G?Ko6nSpkZ)w>Ly4KnR!%R) z9L*{6Dcx#ywpQXt8Z(YB$L8N(^n$cJF4|8RcY!|Os4+;PVNB=dNVqckmcVeoLyn* z;Yk11jt^7Gg!WlYA;rIRpgHb(&urulhTVRTm2ySXaYroEXx!Z}uT&_vI_3O%$6&i& zr+DEN3!d9{IBk<@fX7z1mm6*+j{7turterh0a%U2pzV77flL2~5Kr&Wp2Y$5Fa{IU I0U7!J05&0R{{R30 literal 955 zcmchUK~KaW5QXpk6_a?_6HQ%jJ)2ET%*Kl+u2wPmjOoL zIP@p@lx}i~gbH`Ja4_=GS<})J?ddtEbST4z(l`2H^4bc$cO80|$fLF~{lVcBiYKR<4sZZr?Pa#G*+B9Iv85M#l6)ZJxvc{} zq(q-sUu`+xev|y&GY7V^FrWBPS`RjxNo(YpeKN<=nntwZ5C$ zshh@+ub$a+Gig`U9Hz4R8j!SVRVUf`YH>uX13dsJ0zC?puA0?uxzQEv>ebm@OX%ys z(REi`i1t4UgjPWLKmax2Hrqn|I*4!xVM1v2TlnQ6AUF%4M?p|ULr)v4BQ)R>q#%8~ literal 1398 zcmchX!E1vs6vprV6%TgsQl0JEi{~K}O6g%cjUA$SDWNgRlIYg|eo-?JhLp8+Ihded zKJxpXFAq>~iOJCrKT&A2C`pot2(ecbZ5{z6aKdx9=*Edlnh(q2X;ot?EV#gfQ7xw! zgv4sB+(^o$L&He*BdC;r@ikJ!ao8$JjiZeKar#&in%Ym!97SyhA>;ChMjLNDs7qwZ z4E7d38k808o4Q2fKWDu+MP|3ps8P~atz-^wuv)-o0c&{g1>6P-8xG)1(>dNNgIWu$ zQ99zdk^%RBgIG=laZ>_L=^eHx0@6K;?C-Ji8E9GjpUoD;W zHFf9fo9C`scAcKhD4RV3C>pkN?+k5E9}V?h*DiY7Lef0qG^JtDD+3UMR2r}@%g}S& f(b%CsRUm_q+S{q*`PEYZN-Tqq3SdV9U!qw*`GRxl literal 1188 zcmc(eu};G<5Qg_Wg(Ze8IE2zEBdRJPp^AkGF*xz>%Bo`<+X?XYIEgDof(+1Bc(70B z|L*kN*;iyMHR#^4cyQ8}8KpF1O6?4XuQEa?IpA|JhINpdSCcvI-gK_PRw_I>(@Tyd zWZt3)GpW=8PO#=EXiRi`%oKT^LN#kK3nU~jZa6G7_ta=wGhX<2DMIx5DMm=WhqEr$ zI0n`b#!a<6-a6<8yRNO_qM#fLaR~pg8S_3{qbu@4R@Y=rUdLPM6OT_BgX@NL=jujl z62)o6ex=^CQdFjF^1z>3KB?67_fp9Bqk)z{AinCA{c6LZ7L&!10#b& z2S;^cU}z494vhXK&J2DHk>PH5-uHcSxq9QaEhzvT0MgP|7@2G)c!X^0XFmj=iCp#U ziqBD>BAe1J*5@0+e|&9bQiTP`=fZe3StyK!uT4>V6UI_-BGvi}3w*vXS%g|-=9Z{$ zeZE3A7wemNVX`H%jWAX|-x4L6&jZv0!IyhSt&yWDO#_O_^dG=!2cSf6M#~G;!n?=R zYb@U%$=}lPVMa+wpS289{7VPg&jaU4o!Db{FdC}md`Y+LiJEOT?^>!;E>^nzO5vif zsk>gkbm^3ej@`2uZIu&%ykXgo_RwsiWD2mBNI=ha eMq``)RE9J{@?b|{&yxUhm;euDz>WkSY2Xhp$#ks% literal 1185 zcmc(ezfZ&<6vy}e6(kN_q}KDM&gK#my|_3T2M)em$WcI`RsVZwi%Aphpm!G;fV`i4 z-s4@6jWVEn&(a}CUl)|pf@!_A0--4gq2z#%;WDg)GNPHT(;jT+IW|h;(c4}LWJ4Al zc$}Fk6X7M}Uk2PJ!TZdjEVHX&EoP2{l+~4hgAsvRL)-MyD!eHflQ2w9Qkgxx^C`*X zxr4NRN)_<_yn%gH|zia diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/fail-with-bad-deps-fine/main.swiftdeps index 5844ed2c32e396173bcaf0325b703983948c8ef3..898b323f45903e3bd5c10f993e41d7bfa89fbd48 100644 GIT binary patch literal 424 zcmYk0ze@sP7{{M`Jo8*ag!T&}e0@((6NSRTE)@cUz-aczy%&b5oMN=e<>=7h=-_Ze zV>R92Ag>J$j{POg4!tHu!}AQE?+?ED!gX0v04M+iq>uU1AR|tfNY+l|jnfg2W{=M4 z7-K^uL-G0Ic*W_Lqm2w5D&?U>obS01r=oubus30>iu=(3Q=JdQCG;KX(zy81>j6}~Gl`SB zrfz-p)Txz9TC8RgkySzfas8p%XvMpm8k2RpiVUzJN*Lg>)nj+eE;V}0t~PI;I&7OM xHrv(SKkDBD%=vs!V^-T1o&Z8XhJYXZ`@h1D`vK&+4+ba$RwNimQ!zpU_yG)?e!2hv literal 1402 zcmchWF>Avx5QTUDih~YbV%JTR#d9$PLg>&=rGsLff`}}slI%ABzOt=?p@`5Vt_NAj z?;iT@{O+LQ60?IL{zaiHk}S&-BE(Knv}FR2!4XgWrhkrH(sJC6t5vP3vEl-sjp{hX zAS6~}?Iuz#9U4aJA3?4B!Pi8QrlC}l1}B98X@1}M>*e;7Ge=R|QOUSGpwY%VkMcb- zWk!FCA1%rncWtvr<3AUJIYnkSPpDDSSFL0TZ?Im#Y5_}l9|YV63>$9XOxru&stJu2 z*r0U8aU}!qKX>9G)`_cH;FR8ChaxcDa{T@52ispmUB*y~d0DQUVjSo(1~f0v<u oQXj%C_u(eu<)kC=Tm2P`5n;~2(dxh}+*xYxuO4yUDsUW9}JD>z|dLgH+%2_~WugDa_w3=WJ84jmlT zsRIK!ICNn2mpC){5u&TZIm7!t?~||9zUT@$00sbA;bW0lbi!Fe=sGOEaW>(l#^DK@ z5_wGM7=OMzT5Ni8;fh(R!j$$YvHzh?H2Rn8@pp z%?X|I<=JLo(U{N`SLPvGV~VnnMMRD`i~k(Wb_r3OMp&ciw}68y026N}-e@7JuOlj+ z661O=^(pM{=5rb0y_qLif8&GhV=s6RhyMMbciR_@vL<`}P%L&jm*-+&R7~47)v7Cr zTh7($fmR88$D_E-6##DRUcWrpNId^;fSCYbW0%eVY3``tySlD9PQ6xjHCr`pUDF)T Z(~q5+;rotV%@Rl#w&=fX8X$#g_yOL*dQ|`b literal 795 zcmd5)yH3O~5bX06D^XmPC?o;yQlpcQ(20f$QTQ=AS?Acsb^`o8c_BrDtGEIe_G&$| z-kJ3k?Ug}#^lUgJ^?8z}X~MKVScy<4L@Ax{IR@i8DI@DSocCZmFR)h{Pu})QVga(? zAmR$DOoVTk_y!0&BtBM%&1Rt*)?!5@YKPvk@UEID;lhM!lsUpXKUAHe5LH!jzS|a} zWce+t%92Z2-SO=Wz*#Y|0^T|pfkW4F_<@*DX^AF0+{3}hXJ<`KFI3R$bfv-~D=ZyF z-;D|`WlHNbTA0Y9vSxab=wCQre%K}qSiuPs6B1{oca1oR0fH+z85tZH85}w| zs#6CBayWEg^e=H{@QBgb;l1Je{d~Xg)#?{bEd@XTU`up literal 594 zcmd6jy>7!G6oq#`#g#f_!XlBSV$W5iEK!$CQ3nEt6vYM#IBnm){;TArojQ~OuHZZ8 zUd{vUtpmG8IUJhqykLwKvTcuEBQ*sPqZ>ZQVq7=tbTgOpo_rq__O``y^mnVVfHDQB zyh5$Zh(@Y!K>6X~V?}H>i`2;uD_?}+ d%A^Y|I=C#e^=|4&^gn{x{uIow$&_VTd;viIpt1k} diff --git a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml-fine/main.swiftdeps index a9561fcf725d2213836793d0f20ab5230647d057..db076f86e69f651c79d76b99391c6b075cd8bd03 100644 GIT binary patch literal 408 zcmaiuJ5Rz;7>2(dxh}+*xYxuO4yUDsUW9}JD>z|dLgH+%2_~WugDa_w3=WJ84jmlT zsRIK!ICNn2mpC){5u&TZIm7!t?~||9zUT@$00sbA;bW0lbi!Fe=sGOEaW>(l#^DK@ z5_wGM7=OMzT5Ni8;fh(R!j$$YvHzh?H2Rn8@pp z%?X|I<=JLo(U{N`SLPvGV~VnnMMRD`i~k(Wb_r3OMp&ciw}68y026N}-e@7JuOlj+ z661O=^(pM{=5rb0y_qLif8&GhV=s6RhyMMbciR_@vL<`}P%L&jm*-+&R7~47)v7Cr zTh7($fmR88$D_E-6##DRUcWrpNId^;fSCYbW0%eVY3``tySlD9PQ6xjHCr`pUDF)T Z(~q5+;rotV%@Rl#w&=fX8X$#g_yOL*dQ|`b literal 795 zcmd5)yH3O~5bX06D^XmPC?o;yQlpcQ(20f$QTQ=AS?Acsb^`o8c_BrDtGEIe_G&$| z-kJ3k?Ug}#^lUgJ^?8z}X~MKVScy<4L@Ax{IR@i8DI@DSocCZmFR)h{Pu})QVga(? zAmR$DOoVTk_y!0&BtBM%&1Rt*)?!5@YKPvk@UEID;lhM!lsUpXKUAHe5LH!jzS|a} zWce+t%92Z2-SO=Wz*#Y|0^T|pfkW4F_<@*DX^AF0+{3}hXJ<`KFI3R$bfv-~D=ZyF z-;D|`WlHNbTA0Y9vSxab=wCQre%K}qSiuPs6B1{oca1oR0fH+z85tZH85}w| zs#6CBayWEg^e=H{@QBgb;l1Je{d~Xg)#?{bEd@XTU`up literal 594 zcmd6jy>7!G6oq#`#g#f_!XlBSV$W5iEK!$CQ3nEt6vYM#IBnm){;TArojQ~OuHZZ8 zUd{vUtpmG8IUJhqykLwKvTcuEBQ*sPqZ>ZQVq7=tbTgOpo_rq__O``y^mnVVfHDQB zyh5$Zh(@Y!K>6X~V?}H>i`2;uD_?}+ d%A^Y|I=C#e^=|4&^gn{x{uIow$&_VTd;viIpt1k} diff --git a/test/Driver/Dependencies/Inputs/mutual-interface-hash-fine/does-change.swiftdeps b/test/Driver/Dependencies/Inputs/mutual-interface-hash-fine/does-change.swiftdeps index c3f3e8151be883147b2f35c4650de0f0918294e3..c40809bb79d8266e4484b8af022a45baa7906730 100644 GIT binary patch literal 476 zcmYk0ze~eF9K~P0{gJwei0%G~J z>%2!+hge7b@@3&o^7p{(+A6|A;yszYwOJ&ycY)a~p|J%2i_l56KE8AN*|;H!~`#s-ePa=@($`7}!=flj}!D z?%rp{1{KbxPl|8Y8v0UYJSzrFL|QkGSyAZ0&YXJtm>&#KM{+q@s=wtT4SaG>pxogQD>~vz)rm_ zPDHa@Ym26HesFyuls^S*oj08JKR1yC6=N|}gx6@QjGlz9Lnr7d=y4<_zwsYW0P!dW bpW>in4ZijP^r1yK0(_)_Jzs?bcALv0&z!Tp@k z#wTwh7Fa0LE@APbLYd>dDi>({>$C}BSlH;Ez7{oA+p&!F2h9SH)GHyE_ z+kJ{NRh{=-)hM;V5~ZV#E7`0F@b@LT4VC1iDmbNQxJJ=oopUQZG&z4++YfQ1mjyY| z#Q@D+h~}~|#~;weZdV2&j_Y5z?*AZE ZJa2TM!H@nOStb;9d%4EPaV1F-eFIyd3^xD( diff --git a/test/Driver/Dependencies/Inputs/mutual-interface-hash-fine/does-not-change.swiftdeps b/test/Driver/Dependencies/Inputs/mutual-interface-hash-fine/does-not-change.swiftdeps index 5dc734cb0e00071b37831a90b4f24165fef24d9b..d62a86322d3a5ac0afc532469138a45fbcfe5b80 100644 GIT binary patch literal 472 zcmYk0u}dRS5XQe9lWc56-J3PJ=y5lh$Xi$*jF*~R0!WlfpF zBBh1J7M5z2!eV(^q_Ff45$hDbH7Zxk49xHQzL~Z4?Hw%(Z~(e?9}jKTlYB^Q6y|Ov z@5%hiuT|bBt4pk_x_q2}mi#3&d$y9Wh|rR2#nNIH$Y++G4CbO!&0=`?Tfw|Iu^?RGA=n&Y93N&{NO}x(+>y^wb!A hur!d0ClF8ybf6*7UV&?9G4_D~Iba(L_}>HdWFBJBa{Hp(Ro|lD$*8!o+^^+%eR)PRO~B z8EyOqO_uff^^C=j5@m*qvRI<=ll?l(Ft@Wu)F|1DRx*WGn8YxSVGzSGh7r8gGHzQU z+y0C*Wwq|P>QQKc1xiO9SF+v_;4g}D8!F04b#O}0af6}-JLhqDsMq{u?jXd`zbwd! zJ_cy+LNu3!IsTH;-L4En9M|nifaX3#bFHq-yrI53&be>CR6K8WpfipR1?tkw}J0t?@`>!6qI}iI#fBgy>7b zri6~={AAVeXhP^h8dJfRs3J_TnCP)&$seQMEMgR^G1^G_HDLDwz`~yiAIwzqWkA(q z;#_U7e<(X!x$K7WR?iW%zi^=a(24HVet6gG+;ml^Wa~WatA$qU{8Wvcvg-$~X$6}4 zlMC!>WS67xl2hzv^8nX=r(5c+AUwS70c19S)YnWnJSe-4$+>IWerN@}Qstp#1(gbF OJ`bvy{Qq)z2EGBmzj>1Y literal 592 zcmd6jKTpFj5XJX=ijx>RIZ9I~Y38aDOU2R&F&N)VWi_#l?UeHEasD7>fr$YR_UZh4 z=jV4v2W=qEUZ#WTT4X|qOt$UOGD4jZ3A*5OD28>>hU=-E_F#LjaL_HDy}fG249ei3 z;sVts!Z%WV1InhxZ9%M7v((5A3n5XLyyf9TH<97ONHyA=;hj%YC-m`ty?rQ{x0{Vb zskquP%2HKT>Pc3+Q5Eps!zdj4?hQT(i?PjU!qXlOhEL9#nqKI2ywG9(RG9rl-w*!( dDw58%=wPCZ+M4l2qJNRg`lnoe4JOa?>ePXO91a~A{Y#t~JYsZqcyIWAKi}_r)!Jo4Ndr&-*jC=>iA%%ybL`HIp#qm1G8g)kt0Sa73q2N8D&^`Ui8!6QBtdH8=3=C+ zIGrIf5sUM6!X+^xOQFv=T}f4zaT*~l5;XqnsMK;2mC;Drvgy}=!)pLj{*3(L92+k~ zg3pkByTAFN9PDM%TgqD{gQWc>2O1CUu#X2px7Y66VLNYWelWnRBP@C}72cX0p! literal 594 zcmd6jKTpFj5XJX=ijx>RC5lr*n#`zDmx_f6F}U_~v6|Sf?G*U-BSIKHdG^ z+4t^fuMN_(=ffrGmM3YNCcJHrRw6VBQA!tlj>&i~+Q?>3=NN471@^kdleaf5v4A`{ zh`2(viSUYxZ$Q|g@UbE`n?-7Phn0}X#y9vZylWLDT$nJW%^BYLVeHI;75A*J*p^j! zURJ!W*-7kn+oC8{`Jlw43b^(#0>{2P!4JZGDodzvc!YzI&(4~LUg&jd=&)=RmJdbW gj|=>jC!K52!9*UlHPeek|HByelQF+KlVw@*1+Vv?6aWAK diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-after-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-depends-after-fine/main.swiftdeps index 9183a8ba33282953213470ea05e0ce6f04649ac5..0fbef28af95e2d036619182ac932f5f99771546a 100644 GIT binary patch literal 392 zcma)$zfZzI6vtmrL0E_}aj%In9M{sL{IE?Ju!0jNCM3>6@0wsD8X>rnlaaxJk-?#Z zqdIk9AcsQ-M*k9L29Fq>9o`$h-_Q5^UcGVA(oz5f0Cu$ZMeN~;Br(Ekk$sh9B6HQl z6Ea2S7~!$na(T3p9LDouDWrBpr3?+&FI%vRKq3jKwnc%J3e54D>jac`Y+B;3L#gXJ R+z*_ReasV?|8eRJd;_f2c#!}A literal 593 zcmd6jJ8#1v6oq&HiYs-zFOzUQx>X&lalOLnR(F}Nw{%#ajP^18v zH>hzLQ49G4NM9~KH^gqYN}aIS2#IW&txg|CXN8bvN*i}Y46(Q_sA~4Am8xqs=a&O- z(6yX*T??t(=J2?5O?V&SB+jF~AQmB?%@lMxJt4rUm*8DbuS9S2i%ILR(mGI%<7D+$ anbz|dV&W|Qia3Y?f-9+v3=WJ84jmlT zsRKjvaOlA3U*gQ*BScq+`)+d1@0|OZt;;JR4?qDRCw#<-MW&1fAWbcfkPzvNDbE&(nKBQg2}&ghA4-OMt>cRR*9oL8giRA{Tgt117Pw$qdSg8^>s|d zGpyb1r$2>*-9kPqyf+HS?QcGC_1N`?;>ha{y1jd`R@P+K8;Qks`}#ukYZas87;4p# z#4YD&rmt0e&vpsV=Jx=~N^f}U^~-}zkLx`QHo5@N;X9KBY@}4MJ>S+eU#}XbV|H9e iHFVup4b|6;6VF$T971Mii~h@I0Mc;^#+U{a`Hdf^OMChN literal 1010 zcmd6lO-sZu5Qgvl6#)-DwZ^towr5!oWbxujJfz8+HEf&2B(3`I?UzuHdf64sAsHs` z%;cHL71=9|)&A|xxDk3ByCwz{^xK2uoYBuNHo6d3URf9)odL^(3 znYZ9!B~?1WNyfhg+zgJ7l_HLpP|aGb0tt!JYZG4KQva@G5U_rhN~Mo*)(xp=eGOUX zxh%4B$9GI{S{6l3ODc=<7Lt}z0gty1n&Z&5HQW$LC%1s~_jj<+;>j9ak!O;Tm+4CR zh0QO|3a%S5F4dXVHfW&(3(DxJA|d~$JvUqJIjcLt*a!4z7TimI7dGYmG3IQGgZ?eZ RnbX~%$+u{Jg-O#i`T}%P38?@8 diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-before-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-depends-before-fine/main.swiftdeps index b21ca1bfe8e11b02a36e870fab3fe2dce24bc591..e64b80c08a11666407962925adc27e9522d94065 100644 GIT binary patch literal 408 zcmaiuzfZzI6vtmrew4)!6Ze`J!*MMwl-80kU|)%cB)1Ure320>Kd?Q?5U|c)|43^KGNz ztIC%1&01)dL)s0n=*oG3l78d$`lZ1}6VSVXECF~TOJ@Kzb_}o`@3`uFwrM(5$D!ETQbG+sXIXX5Rg8D2ws{JTQL+U3nBQOD3Di&4CPeces`=xU^S|n7nDU6y HG>yIhy&lwu diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-before-fine/other.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-depends-before-fine/other.swiftdeps index b0a83b5a9b5beaa0f5ebf0158e912ed39009452e..c49bc07e3e6eb0f49eba50005acfd0fca1a2e08a 100644 GIT binary patch literal 420 zcmaiuy-&hW6vb~Z--}Tb_nH{Pz|dV&W|Qia3Y?f-9+v3=WJ84jmlT zsRKjvaOlA3U*gQ*BScq+`)+d1@0|OZt;;JR4?qDRCw#<-MW&1fAWbcfkPzvNDbE&(nKBQg2}&ghA4-OMt>cRR*9oL8giRA{Tgt117Pw$qdSg8^>s|d zGpyb1r$2>*-9kPqyf+HS?QcGC_1N`?;>ha{y1jd`R@P+K8;Qks`}#ukYZas87;4p# z#4YD&rmt0e&vpsV=Jx=~N^f}U^~-}zkLx`QHo5@N;X9KBY@}4MJ>S+eU#}XbV|H9e iHFVup4b|6;6VF$T971Mii~h@I0Mc;^#+U{a`Hdf^OMChN literal 1010 zcmd6lO-sZu5Qgvl6#)-DwZ^towr5!oWbxujJfz8+HEf&2B(3`I?UzuHdf64sAsHs` z%;cHL71=9|)&A|xxDk3ByCwz{^xK2uoYBuNHo6d3URf9)odL^(3 znYZ9!B~?1WNyfhg+zgJ7l_HLpP|aGb0tt!JYZG4KQva@G5U_rhN~Mo*)(xp=eGOUX zxh%4B$9GI{S{6l3ODc=<7Lt}z0gty1n&Z&5HQW$LC%1s~_jj<+;>j9ak!O;Tm+4CR zh0QO|3a%S5F4dXVHfW&(3(DxJA|d~$JvUqJIjcLt*a!4z7TimI7dGYmG3IQGgZ?eZ RnbX~%$+u{Jg-O#i`T}%P38?@8 diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-after-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-provides-after-fine/main.swiftdeps index 2f22faafc626f27f1bd7bda77f888e669ef8be68..dad97a138822e81bb9a521b469d19e6429107c65 100644 GIT binary patch literal 408 zcmaiuzfZzI7>2)|{9K4Jaj%In9M{s8+NucyR&c_^gv8m>_7Y4)BLr7c85tZH85}w| zs#6CBayWEg^e=H{@FPT5hr8i@pZCdEZ(O#d8~_7=tn@KY96A;(A#@cM-vk?rQg#27 zO^7-obcDZH94rO<3YD>g2#pAv2<_RSbD>Q`Wki%0p~Zq>QmsGHC}dNICPYb`QcToU z$Yz92#NvFtaA-{EQfRY~tuRGd$ReUfg2jK1TBC$0P9v<*^jpB*HGqvb6Ms0D_17Vl z&xm!illqi)xAVD-^j^yotiSO=>#@W8@*sHVb?&;dRW?;W7|6wD^Xfw8mSMY|tyern z-f*6I!cBt*ZJ**cR{*$mJKb_`E%Af<9%d4Ni(NVcq_(94uNXEzwDii6YjW3abJI6$ Y&uHtG?;oQmOCVj?p#QRIfE23X2h>q|R{#J2 literal 795 zcmd5)!Ait15WV*+20ZMkrR}<_^ehX4EM7c`hctOv!lp?~(yD)Nn^q`@2XPPPkPMUe zX6C)*iVn&kKY2DDf`&57^E_i(AFV)WGNPQ$_?Uueos|*I9L{^Nz2`V6jYn?>C9nWl zaNuzTRVKnq#=ijEj*0gbVzXJOhILpGiMnyNBD^UX1zbodsmux9`LXH@m36h3*SoU5 zVOz=et=x)g&#SiF32`gYCRV^}55sZnyB2;VmMJYD!~Go`jCgX^H1te0y`(D@7Fl7L zDEfXre%K}qSiuPs6B1{oca1oR0fH+z85tZH85}w| zs#6CBayWEg^e=H{@QBgb;l1Je{d~Xg)#?{bEd@XTU`up literal 596 zcmd6jy>7!G6oq%5;z}JdVUfsEvF9pMm#9mpssn*Tiedu=oVIUY|5fr_btnT|!FSHR zoI5%?4}M8%JPh3g+qDq%^9qq$`QJ3 zQ0EJhRr&|eVZ8X<5WC$f^{U54NEFH&Qk6fPEe0{qn05Yw6w_$Cu%_M{sZArT5a)xa z(MTbhMnYRzAMTg78SewU#%bu!NTX29W(GDtJ|M!I=NNoTFGR2Ni_7b`@;XsT!({bW aq4cps4_{Pq!OtCu{zo$VUnNsj6=UC3ETG%~ diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-before-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-provides-before-fine/main.swiftdeps index 2f22faafc626f27f1bd7bda77f888e669ef8be68..dad97a138822e81bb9a521b469d19e6429107c65 100644 GIT binary patch literal 408 zcmaiuzfZzI7>2)|{9K4Jaj%In9M{s8+NucyR&c_^gv8m>_7Y4)BLr7c85tZH85}w| zs#6CBayWEg^e=H{@FPT5hr8i@pZCdEZ(O#d8~_7=tn@KY96A;(A#@cM-vk?rQg#27 zO^7-obcDZH94rO<3YD>g2#pAv2<_RSbD>Q`Wki%0p~Zq>QmsGHC}dNICPYb`QcToU z$Yz92#NvFtaA-{EQfRY~tuRGd$ReUfg2jK1TBC$0P9v<*^jpB*HGqvb6Ms0D_17Vl z&xm!illqi)xAVD-^j^yotiSO=>#@W8@*sHVb?&;dRW?;W7|6wD^Xfw8mSMY|tyern z-f*6I!cBt*ZJ**cR{*$mJKb_`E%Af<9%d4Ni(NVcq_(94uNXEzwDii6YjW3abJI6$ Y&uHtG?;oQmOCVj?p#QRIfE23X2h>q|R{#J2 literal 795 zcmd5)!Ait15WV*+20ZMkrR}<_^ehX4EM7c`hctOv!lp?~(yD)Nn^q`@2XPPPkPMUe zX6C)*iVn&kKY2DDf`&57^E_i(AFV)WGNPQ$_?Uueos|*I9L{^Nz2`V6jYn?>C9nWl zaNuzTRVKnq#=ijEj*0gbVzXJOhILpGiMnyNBD^UX1zbodsmux9`LXH@m36h3*SoU5 zVOz=et=x)g&#SiF32`gYCRV^}55sZnyB2;VmMJYD!~Go`jCgX^H1te0y`(D@7Fl7L zDEfXD6r@PvfK^CLFfqY6TiREHF=~MLv60Hi;K0b> z(7{oi7#PUYfx*$g#F@cMh{ny~-r=0{JNNFD4{M4FzyTnlypAUp>q$OAHudArlJ{g{ zdwqxZG1*1dr7hn!J|zG2^`1o$79j7-^n=C5GClD1F6xgmJ(Qf3?Y(;z_(OGrFCz zmU-$hZ5Q)rE1`E~H5OGDm6uW!$^N2&+D*f2YuBRLYFu7u`BX0Hifb)itsWm}UfwWm z$IN6MU7P2eT+z!Jo~XNwSak{DHr1LnxZssdoo^cdYgzqH%cMq4!P^P{^fp{@Yz zU$n)kX#P0Z;6Eysnmg-K=vbGCQj^66un;CsJ2&T;*yPSQqXiH zhM4E;=~GcmST4rM$Al9xW_*oxm#5E)G^15juF1v5K|Re$_{B3>()`UDJ%e``^`Yp) z5I$;w^evfhe=4}@2yrW4N~@?O9WY3v>n{TQzd3oAIaj$7j9t=>REv4bL(;LyMHk25 zz93ibY6s0@7tMWPE|2b984ODqqmSzKV4Lv&O5*UZSOS$lpTRqxwnelg-a%){MwgLg HS(bbQAVYY4 diff --git a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps-fine/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps-fine/main.swiftdeps index f5b2d6b0dd35ceff4cd5eecd5498947bae8cfb3c..4553fd0ac029f08b172bf14cdf3f11e983cfee31 100644 GIT binary patch literal 392 zcma)$zfZzY5XY}iL0E_}aj%InJYGwG*{TTxR&c_^gv8m>_9d8z#u{8nWn^$*WN_%< zs7@Ui$itxnqkoArgGY?c4tK-%$LFrmJa0<{00saX()%oP=}54Q&}CeH6>KCbwcTSj zChCyTA#O3>TL|_UD*j%HanI>+D=-}2=;(G3 N93miB`d<#uz&FfidDj2{ literal 592 zcmd6jy-ve06ovOZ#g!O3IZ9d@P-aw#rDExX7##b!vKs$jJ1x9Di4&wOFfri4zPkR- z_3^o*gSKGjz{f+z|dLgFm6eGvySl;BD#BZC7YgF^>L zb?U%C9u6HC{Y#t~JYsZqxEsDdK6lmHWkbpVFaX$)-e;*xM}nnrijx>RB}!TvP-aw#rD9=1436))wVK$*b_)D^5+_JmU}C_-`E>Wa zv+v!|K^x>JFUE`MT4s5kXQJzlmJynaD5ncPr(`-8ZMd1!IR-m;iG%L&+yH=6mLc)|bCwS+_u`{c-RjqFK<@QeO zl&D*^qDO0CK61I5F{*k_6#(P<*3gN=xay2VwNH# zt^=|_ct)4!8;6M_gjZBr1Z2&oEG!@)5<^O&zl=t^#874pnaq-Y1t?qr80==`j$>Ya z9b^6sY1aokpQ)q$JeN(qH}Z(d->jhf*!Lg!k#|4r-wt@KtctET;)|V5?}GO=MYkMX zt~dg}{1HEi3j lRBIKbrW%T+8;++KhHc~!WcIe`zig%e5T{`r90Krc{|~gzds_ei literal 1006 zcmc&y%WA_g5WM><1U=+r<5v>lTcHGc3B9zJ(t|9mgNU_KB{^;XzJ91+2rhl3R0nBU z&8&7-b47L%AwF2vAA+3HD30TZwe4ODa8*P|Opfq21j9N?6x9??yVITJu#+v^S$&cM z0+2Za+|QsAJ=liv4*=JF;&p~ttpXL9f*FyJ>%_gt#tSfRgftQlV2$ldPPk3FuIaig z1g+~PFSmKNEojCzltV^oO-Gi4=MIp=zEd^Wo|ukl0gb!80Rt%RjmC;RlAJt^SJDMd zF0|uqH?)7Li73;80`$yFjpK`i{Qp?8rLp{KDyWr2)&`Z|cSosugJ$d@6gcxpaL?H% Z=SynRKb7;Pul=c}VoB4dl9D8e-T?gahLo^Px%P+ypG*wAMAFho zg($uD$qeB!U7T+m1`ZKk(d^78Yqn)!J_%4dpd|dssMJ#oW!8YnEa_W-L>s_hHzQ{- z7v<*x7SE7+br^l;jt}C(4)~VT^IXfp%q#2ySef1?!EtYUAh5qGT$`P4&T9S6=AYSZ@jHMj5gD|S ztJ|_(l1;0aR}{yy99>hLl3h^Lf}AhL5X5-k_qR0s&qskz0L&vW@Q(o6)jfcz$PQxl E1r`H>{Qv*} literal 1424 zcmc(eyK2KQ6oz*{#eoi4YUB8l*q%$EOX$)rrGqRT2NCO1$xhq1uP-VXLP(t^RD&d> z|491I`E>^yF45l^(hUp_q38R)N9ua37}~-E@L`W%{iJVuE?F^7$KI;eP~7kupNu+i zhE7PVM%qlITsCMbLVpBQbqk*p#bV(?B@s9Y1SkXh!K;R$wu7YNa)(Bn?#NNM$}p#4 zo`s}bM{&%mlI5$EWi*M?B#hQWl*RWJCBl#_YlF` zu*FJ$Kcz(~!6m63=6r`FqBH5Td~pXH z`NTQssL;_VobaYNzpCw}Oz|nEnx#Ds*I{!B0tjTl@>Wn^$*WN_%< zs7?$F&BK9#(Z9r*!AFQXI^5-Q-_Q4(%hl?aO^yd30FdO~qlJk_lq?Wl1({b$Ml@SK zs**91h6oQ?r}N__C7*#fG8uwHM8;HpGI2!ZNgxi9_)O&~C2Ui!J>oDR6B93xxG=L* zB&`B6LwHQ*=WBJ)*57Qm5?g>OF$D}yQ*B3a w4ZmcouC3}NwP1Kf-E&S#mR7QoaY!Oa>~3iImrtYtq8JQ<1AumQhg}5l4Fht3dH?_b literal 1216 zcmc(eJx{|h5Qg{s3QG)KNR%dNLo%aEEENkZh{3VXl~sRXI|cqd`7lzXDuMtN9_*9- z-r3LH`3mj0g7{!@w@`FSqd1NuEW}<@aCL-GjE?Z$8~r$PMeETVXQx|BV8;dATYcgb zf)G0c#80GLd9VzVPXW>0#@j@(S_M~yB}^O{y6Uwepfu4s` z?gEwzFY>nS3H~Z6(g={CJoa3x;l>X4-!rqG%gnE`qO{}+i$J-&K?>RR=$br+0B3Cy q8tAOf*&I!JQJim;_NPqw9MeUSzWTx=O|!T{#ZnrEg@Y(blIR0oU_I^t diff --git a/test/Driver/Dependencies/Inputs/private-after-fine/d.swiftdeps b/test/Driver/Dependencies/Inputs/private-after-fine/d.swiftdeps index 93de7a407514b9bf290fe7b55739e645ee530b6c..7866ec7f6385b8d920c87a19518fa72d0c47ab0c 100644 GIT binary patch literal 408 zcmaiwzfZzI9L2AvK#7SlChjFMhT~dVC~a-RfEAoDF(GlbKNCzuBL-J;GBP+YGB|W_ zRHqIM;pLvqR=woicfZP-(4}2U2U$7=5$U8#cG~{?`a=an=nz_{2I)Ax zce;CecW_XI>B+O<5OB$pG))tx_0b9pO#+a@89&EhTxUh1nZtPxw)Y$lO5>xq7bP$P zS#Zd^1yoUoUNZg-;C4uSED)MJM#m4<%<@joY&2xu|8; zmZB|pRaw-y*&)BL*tTL5E8ts?#PQgh7X3iXr?fyB9`@*v#FMkszzY=cI$fy{X9}^M z&i7;cf2D|V8Vyp%I%R2k5#ax2S^p%a#=UT%AVp2+J>AO*jRm-h3i)M5hi(v79=k z1S_kE&M=wq#o0RHkOY$@S7#AjfeK|2jj~FZJ^Vkg^qyf9{cW--=QP!1!4WwebeR(d0M#Xe} zQ>*&2wBdZ+4)sdNynsMf+(C$y`|E~)-Sv?Oe^tA2yS++qnaLvD*wT>A4Bhj!zz!`> f4?Nwp^s3EjCi9Oi*Rb3iMw#6W`Y)R)z)(0pH9C6} literal 795 zcmc&yJ!``-6x{tQ1RXNjICc`(oY5VW%4;2idLujEIq{q|U z(|f18BL``ao;)26PA++prfEWzI$Dm!jwq?t5UW=+N zd0XzPvZ%4yf!$YhThWOX@YcgH9DCiu55#;*bBOS;hlAly&YFh2kb=BUS2DzzLTsn= z{n-9rDWaW%hUsW0t(jgVnf65Vt4$;GYH L2&w{-EX$HFGr-cf diff --git a/test/Driver/Dependencies/Inputs/private-after-fine/f.swiftdeps b/test/Driver/Dependencies/Inputs/private-after-fine/f.swiftdeps index 993aae48b3a01fa996bdc97a56af898ba57dbd8d..24bed2a42a7facf0b13e4fa364b53fb46d084896 100644 GIT binary patch literal 436 zcmaiwu}{K46vkf1b6M*k9L29FSR^djii%Z4BV5CDh^??GtcF(VmJy|$lxv3|Qko?SYGe-EPRDHz0N2V4IksMm- z8Op3YGDmpA7Uye+g=YvaS#Iu;72onOkN7C#Gcx)T-fjNPv>Dq1RE{WMQcdmH wietJ)M|C=?Zm0#57IkW$7;VjH#}UMKH|YOt6kk literal 1214 zcmc(eJx{|h5Qg{sijx>RB}$XDp_x%7mWl-y#NgPkE31he?4-cICm%+tR8>$)g$LU@ zzh~cbcfO&u(g?Sf^^2f=9E4#Qu&UY^0apY>A?@%nY=*H@S`^cEnw{w^$68f*ux76W zypXvDygiUA-NH)7zXaU$hW7)-Z021xt8w5+BqR5xWGm3PQ6iPz!ZxIUBtkUOQ-xO;?w&y<0()rsQQjQO+Yd zA5Ck!A^N{cNZnMZp*Lm7_}|2LyjPcxKRJtniH9|4kWfKzrevPOX* zzl^YOhSaP5=m&SWm*BU!w@Lyr`HK}aA9~KcFtqOmy_>$EW|fR(4~0~t(Yg>EHCODI zMLBPZ!iF=IlB47t+psY6^4kF2>|mW>*|!7W*{=%MonAlJZT-zoE4Brw5|N=~tBPUD xR>{!}#WIwlrsPX@p=g^YT1VA7@hHR*#CA6{{L9CZ06_#s?g2o%y2CC4_y!45fQA47 literal 1216 zcmc(eJx{|h5Qg{sijx?+kSI;khGa&SSSl7+5QAf%BddvRY^T7#Cm%+NR7Fsr!h?OX z-#h!cJ72+0NDOO3`h~$U4#F@DNYm^ULt6#_Asq01Fotmul9iJ=%~o}W;!ZSpZ`4sR z^g?1aQa6(d>CkXOKLu3v8*ekkYUN!eX>sNVP)GJvaK}*FQNo3+(P-0$oOA_l(u&5c z;CYp@D&6L3Qed`4dXtk)PDU?_FC9vX`>w6f^p5ek&5+x>Thu7ogI2PHCrGX#gXi&7 zSdV4>i=62Og1<^is~c=lI^u+qih>V`v_1j= diff --git a/test/Driver/Dependencies/Inputs/update-dependencies-bad.py b/test/Driver/Dependencies/Inputs/update-dependencies-bad.py index 97585bd4779bf..dd5463259410f 100755 --- a/test/Driver/Dependencies/Inputs/update-dependencies-bad.py +++ b/test/Driver/Dependencies/Inputs/update-dependencies-bad.py @@ -22,9 +22,10 @@ import os import shutil import signal +import subprocess import sys -assert sys.argv[1] == '-frontend' +assert sys.argv[2] == '-frontend' primaryFile = sys.argv[sys.argv.index('-primary-file') + 1] @@ -36,7 +37,14 @@ try: depsFile = sys.argv[sys.argv.index( '-emit-reference-dependencies-path') + 1] - shutil.copyfile(primaryFile, depsFile) + + returncode = subprocess.call([sys.argv[1], "--from-yaml", + "--input-filename=" + primaryFile, + "--output-filename=" + depsFile]) + # If the input is not valid YAML, just copy it over verbatim; + # we're testing a case where we produced a corrupted output file. + if returncode != 0: + shutil.copyfile(primaryFile, depsFile) except ValueError: pass diff --git a/test/Driver/Dependencies/Inputs/update-dependencies.py b/test/Driver/Dependencies/Inputs/update-dependencies.py index 5f29e0541ce1d..c366439e01358 100755 --- a/test/Driver/Dependencies/Inputs/update-dependencies.py +++ b/test/Driver/Dependencies/Inputs/update-dependencies.py @@ -31,9 +31,10 @@ import os import shutil +import subprocess import sys -assert sys.argv[1] == '-frontend' +assert sys.argv[2] == '-frontend' # NB: The bitcode options automatically specify a -primary-file, even in cases # where we do not wish to use a dependencies file in the test. @@ -43,8 +44,13 @@ depsFile = sys.argv[sys.argv.index( '-emit-reference-dependencies-path') + 1] - # Replace the dependencies file with the input file. - shutil.copyfile(primaryFile, depsFile) + returncode = subprocess.call([sys.argv[1], "--from-yaml", + "--input-filename=" + primaryFile, + "--output-filename=" + depsFile]) + if returncode != 0: + # If the input is not valid YAML, just copy it over verbatim; + # we're testing a case where we produced a corrupted output file. + shutil.copyfile(primaryFile, depsFile) else: primaryFile = None diff --git a/test/Driver/Dependencies/chained-additional-kinds-fine.swift b/test/Driver/Dependencies/chained-additional-kinds-fine.swift index f92c6346a8936..7e260fc8ec952 100644 --- a/test/Driver/Dependencies/chained-additional-kinds-fine.swift +++ b/test/Driver/Dependencies/chained-additional-kinds-fine.swift @@ -4,23 +4,23 @@ // RUN: cp -r %S/Inputs/chained-additional-kinds-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled yet-another.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s diff --git a/test/Driver/Dependencies/chained-after-fine.swift b/test/Driver/Dependencies/chained-after-fine.swift index 56ab83ab43fcb..520007d79a834 100644 --- a/test/Driver/Dependencies/chained-after-fine.swift +++ b/test/Driver/Dependencies/chained-after-fine.swift @@ -6,17 +6,17 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift diff --git a/test/Driver/Dependencies/chained-fine.swift b/test/Driver/Dependencies/chained-fine.swift index 08bc5db3a6375..27779098b6d86 100644 --- a/test/Driver/Dependencies/chained-fine.swift +++ b/test/Driver/Dependencies/chained-fine.swift @@ -4,29 +4,29 @@ // RUN: cp -r %S/Inputs/chained-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled yet-another.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240009 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s diff --git a/test/Driver/Dependencies/chained-private-after-fine.swift b/test/Driver/Dependencies/chained-private-after-fine.swift index 6ba403117f3af..bdc6588f348ee 100644 --- a/test/Driver/Dependencies/chained-private-after-fine.swift +++ b/test/Driver/Dependencies/chained-private-after-fine.swift @@ -6,17 +6,17 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-DAG: Handled other.swift // CHECK-SECOND-DAG: Handled main.swift diff --git a/test/Driver/Dependencies/chained-private-after-multiple-fine.swift b/test/Driver/Dependencies/chained-private-after-multiple-fine.swift index 786b16e751a32..c8c7ad9da4c7e 100644 --- a/test/Driver/Dependencies/chained-private-after-multiple-fine.swift +++ b/test/Driver/Dependencies/chained-private-after-multiple-fine.swift @@ -6,7 +6,7 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v @@ -14,13 +14,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after-multiple-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-DAG: Handled other.swift // CHECK-SECOND-DAG: Handled main.swift diff --git a/test/Driver/Dependencies/chained-private-after-multiple-nominal-members-fine.swift b/test/Driver/Dependencies/chained-private-after-multiple-nominal-members-fine.swift index a7dbecd31408c..a96078aa04d0f 100644 --- a/test/Driver/Dependencies/chained-private-after-multiple-nominal-members-fine.swift +++ b/test/Driver/Dependencies/chained-private-after-multiple-nominal-members-fine.swift @@ -6,17 +6,17 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after-multiple-nominal-members-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-DAG: Handled other.swift // CHECK-SECOND-DAG: Handled main.swift diff --git a/test/Driver/Dependencies/chained-private-fine.swift b/test/Driver/Dependencies/chained-private-fine.swift index d0a57f692710b..346559efc86c4 100644 --- a/test/Driver/Dependencies/chained-private-fine.swift +++ b/test/Driver/Dependencies/chained-private-fine.swift @@ -4,19 +4,19 @@ // RUN: cp -r %S/Inputs/chained-private-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1 // RUN: %FileCheck -check-prefix=CHECK-THIRD %s < %t/outputToCheck // Driver now schedules jobs in the order the inputs were given, but diff --git a/test/Driver/Dependencies/check-interface-implementation-fine.swift b/test/Driver/Dependencies/check-interface-implementation-fine.swift index c33c0a12d8fa5..c81fa1bcb5d23 100644 --- a/test/Driver/Dependencies/check-interface-implementation-fine.swift +++ b/test/Driver/Dependencies/check-interface-implementation-fine.swift @@ -6,7 +6,7 @@ // RUN: cp -r %S/Inputs/check-interface-implementation-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./c.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./c.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning @@ -20,7 +20,7 @@ // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental > %t/a.txt 2>&1 +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental > %t/a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps @@ -33,7 +33,7 @@ // CHECK-RECORD-A-DAG: "./bad.swift": !private [ // CHECK-RECORD-A-DAG: "./c.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s // CHECK-BC-NOT: Handled a.swift // CHECK-BC-DAG: Handled bad.swift diff --git a/test/Driver/Dependencies/crash-added-fine.swift b/test/Driver/Dependencies/crash-added-fine.swift index f9d15e9b43127..f42e85e37cae6 100644 --- a/test/Driver/Dependencies/crash-added-fine.swift +++ b/test/Driver/Dependencies/crash-added-fine.swift @@ -4,13 +4,13 @@ // RUN: cp -r %S/Inputs/crash-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled main.swift // CHECK-INITIAL: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps // CHECK-ADDED-NOT: Handled @@ -26,13 +26,13 @@ // RUN: cp -r %S/Inputs/crash-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIXED %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIXED %s // CHECK-FIXED-DAG: Handled crash.swift // CHECK-FIXED-DAG: Handled main.swift diff --git a/test/Driver/Dependencies/crash-new-fine.swift b/test/Driver/Dependencies/crash-new-fine.swift index feb3e2a288598..8afca50270449 100644 --- a/test/Driver/Dependencies/crash-new-fine.swift +++ b/test/Driver/Dependencies/crash-new-fine.swift @@ -6,7 +6,7 @@ // Initially compile all inputs, crash will fail. -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // CHECK-NOT: warning // CHECK: Handled main.swift // CHECK: Handled crash.swift @@ -15,7 +15,7 @@ // Put crash.swift first to assure it gets scheduled first. // The others get queued, but not dispatched because crash crashes. -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s // CHECK-BAD-ONLY-NOT: warning // CHECK-BAD-ONLY-NOT: Handled @@ -24,7 +24,7 @@ // Make crash succeed and all get compiled, exactly once. -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // CHECK-OKAY: Handled main.swift // CHECK-OKAY: Handled crash.swift // CHECK-OKAY: Handled other.swift @@ -34,12 +34,12 @@ // RUN: touch -t 201401240006 %t/crash.swift // RUN: rm %t/crash.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // And repair crash: // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s // CHECK-OKAY-2-DAG: Handled crash.swift // CHECK-OKAY-2-DAG: Handled other.swift @@ -51,7 +51,7 @@ // RUN: touch -t 201401240006 %t/main.swift // RUN: rm %t/main.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-MAIN-SWIFTDEPS %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-MAIN-SWIFTDEPS %s // CHECK-NO-MAIN-SWIFTDEPS-NOT: warning // CHECK-NO-MAIN-SWIFTDEPS: Handled main.swift @@ -62,7 +62,7 @@ // Touch all files earlier than last compiled date in the build record. // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 -driver-show-incremental | %FileCheck -check-prefix=CHECK-CURRENT-WITH-CRASH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 -driver-show-incremental -disable-direct-intramodule-dependencies | %FileCheck -check-prefix=CHECK-CURRENT-WITH-CRASH %s // CHECK-CURRENT-WITH-CRASH: Handled main.swift // CHECK-CURRENT-WITH-CRASH: Handled crash.swift @@ -73,4 +73,4 @@ // RUN: touch -t 201401240006 %t/other.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s diff --git a/test/Driver/Dependencies/crash-simple-fine.swift b/test/Driver/Dependencies/crash-simple-fine.swift index 098d8ce46c855..e796414b76093 100644 --- a/test/Driver/Dependencies/crash-simple-fine.swift +++ b/test/Driver/Dependencies/crash-simple-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/crash-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -12,7 +12,7 @@ // CHECK-FIRST: Handled other.swift // RUN: touch -t 201401240006 %t/crash.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled crash.swift // CHECK-SECOND-NOT: Handled main.swift @@ -24,7 +24,7 @@ // CHECK-RECORD-DAG: "./main.swift": !private [ // CHECK-RECORD-DAG: "./other.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled crash.swift diff --git a/test/Driver/Dependencies/dependencies-preservation-fine.swift b/test/Driver/Dependencies/dependencies-preservation-fine.swift index b420a8830ce68..02a8f94322726 100644 --- a/test/Driver/Dependencies/dependencies-preservation-fine.swift +++ b/test/Driver/Dependencies/dependencies-preservation-fine.swift @@ -6,7 +6,7 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json // RUN: %FileCheck -check-prefix CHECK-ORIGINAL %s < main~buildrecord.swiftdeps~ // CHECK-ORIGINAL: inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]} diff --git a/test/Driver/Dependencies/driver-show-incremental-arguments-fine.swift b/test/Driver/Dependencies/driver-show-incremental-arguments-fine.swift index be02cbf537130..96da82a52a005 100644 --- a/test/Driver/Dependencies/driver-show-incremental-arguments-fine.swift +++ b/test/Driver/Dependencies/driver-show-incremental-arguments-fine.swift @@ -1,7 +1,7 @@ // REQUIRES: shell // Test that when: // -// 1. Using -incremental -v -driver-show-incremental, and... +// 1. Using -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental, and... // 2. ...the arguments passed to the Swift compiler version differ from the ones // used in the original compilation... // @@ -14,11 +14,11 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-ARGS-MISMATCH %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-ARGS-MISMATCH %s // CHECK-ARGS-MISMATCH: Incremental compilation has been disabled{{.*}}different arguments // CHECK-ARGS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift} diff --git a/test/Driver/Dependencies/driver-show-incremental-conflicting-arguments-fine.swift b/test/Driver/Dependencies/driver-show-incremental-conflicting-arguments-fine.swift index d669dcc188058..8d10999ba8bb7 100644 --- a/test/Driver/Dependencies/driver-show-incremental-conflicting-arguments-fine.swift +++ b/test/Driver/Dependencies/driver-show-incremental-conflicting-arguments-fine.swift @@ -1,7 +1,7 @@ // REQUIRES: shell // Test that when: // -// 1. Using -incremental -v -driver-show-incremental, but... +// 1. Using -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental, but... // 2. ...options that disable incremental compilation, such as whole module // optimization or bitcode embedding are specified... // @@ -14,19 +14,19 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -whole-module-optimization -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO %s // CHECK-WMO: Incremental compilation has been disabled{{.*}}whole module optimization // CHECK-WMO-NOT: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-BITCODE %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-BITCODE %s // CHECK-BITCODE: Incremental compilation has been disabled{{.*}}LLVM IR bitcode // CHECK-BITCODE-NOT: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO-AND-BITCODE %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -whole-module-optimization -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO-AND-BITCODE %s // CHECK-WMO-AND-BITCODE: Incremental compilation has been disabled{{.*}}whole module optimization // CHECK-WMO-AND-BITCODE-NOT: Incremental compilation has been disabled // CHECK-WMO-AND-BITCODE-NOT: Queuing (initial): {compile: main.o <= main.swift} diff --git a/test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift b/test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift index c85aef03beced..0fbae58d72600 100644 --- a/test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift +++ b/test/Driver/Dependencies/driver-show-incremental-inputs-fine.swift @@ -14,11 +14,11 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s // CHECK-INPUTS-MISMATCH: Incremental compilation has been disabled{{.*}}inputs // CHECK-INPUTS-MISMATCH: ./other.swift // CHECK-INPUTS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift} diff --git a/test/Driver/Dependencies/driver-show-incremental-malformed-fine.swift b/test/Driver/Dependencies/driver-show-incremental-malformed-fine.swift index 02bdbe375e6f5..69b58ec784c3e 100644 --- a/test/Driver/Dependencies/driver-show-incremental-malformed-fine.swift +++ b/test/Driver/Dependencies/driver-show-incremental-malformed-fine.swift @@ -1,7 +1,7 @@ // REQUIRES: shell // Test that when: // -// 1. Using -incremental -v -driver-show-incremental, and... +// 1. Using -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental, and... // 2. ...the build record file does not contain valid JSON... // // ...then the driver prints a message indicating that incremental compilation @@ -13,24 +13,24 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been enabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} // RUN: rm %t/main~buildrecord.swiftdeps && touch %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s // RUN: echo 'foo' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s // CHECK-MALFORMED: Incremental compilation has been disabled{{.*}}malformed build record file // CHECK-MALFORMED-NOT: Queuing (initial): {compile: main.o <= main.swift} // RUN: echo '{version, inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s // CHECK-MISSING-KEY: Incremental compilation has been disabled{{.*}}malformed build record file{{.*}}Malformed value for key // CHECK-MISSING-KEY-NOT: Queuing (initial): {compile: main.o <= main.swift} diff --git a/test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift b/test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift index 3895382df7c54..3455fb2e484f4 100644 --- a/test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift +++ b/test/Driver/Dependencies/driver-show-incremental-mutual-fine.swift @@ -4,16 +4,16 @@ // RUN: cp -r %S/Inputs/mutual-with-swiftdeps-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Disabling incremental build: could not read build record -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Queuing // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental -disable-direct-intramodule-dependencies 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Queuing (initial): {compile: other.o <= other.swift} // CHECK-THIRD: Queuing because of the initial set: {compile: main.o <= main.swift} // CHECK-THIRD-NEXT: interface of top-level name 'a' in other.swift -> interface of source file main.swiftdeps diff --git a/test/Driver/Dependencies/driver-show-incremental-swift-version-fine.swift b/test/Driver/Dependencies/driver-show-incremental-swift-version-fine.swift index 151e581a114c0..548c83e442b68 100644 --- a/test/Driver/Dependencies/driver-show-incremental-swift-version-fine.swift +++ b/test/Driver/Dependencies/driver-show-incremental-swift-version-fine.swift @@ -1,7 +1,7 @@ // REQUIRES: shell // Test that when: // -// 1. Using -incremental -v -driver-show-incremental, and... +// 1. Using -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental, and... // 2. ...the Swift compiler version used to perform the incremental // compilation differs the original compilation... // @@ -14,12 +14,12 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been enabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} // RUN: echo '{version: "bogus", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -disable-direct-intramodule-dependencies -v -driver-show-incremental -disable-direct-intramodule-dependencies -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s // CHECK-VERSION-MISMATCH: Incremental compilation has been disabled{{.*}}compiler version mismatch // CHECK-VERSION-MISMATCH: Compiling with: // CHECK-VERSION-MISMATCH: Previously compiled with: bogus diff --git a/test/Driver/Dependencies/fail-added-fine.swift b/test/Driver/Dependencies/fail-added-fine.swift index a1e27ab3b4e08..09d6b7bfba419 100644 --- a/test/Driver/Dependencies/fail-added-fine.swift +++ b/test/Driver/Dependencies/fail-added-fine.swift @@ -4,13 +4,13 @@ // RUN: cp -r %S/Inputs/fail-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled main.swift // CHECK-INITIAL: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps // CHECK-ADDED-NOT: Handled @@ -26,7 +26,7 @@ // RUN: cp -r %S/Inputs/fail-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps diff --git a/test/Driver/Dependencies/fail-chained-fine.swift b/test/Driver/Dependencies/fail-chained-fine.swift index ee10b7bbd45a3..e222a83a9d903 100644 --- a/test/Driver/Dependencies/fail-chained-fine.swift +++ b/test/Driver/Dependencies/fail-chained-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/fail-chained-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning @@ -26,7 +26,7 @@ // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/a.txt 2>&1 +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./bad.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps @@ -47,7 +47,7 @@ // CHECK-RECORD-A-DAG: "./f.swift": [ // CHECK-RECORD-A-DAG: "./bad.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt // RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/a2.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps @@ -65,10 +65,10 @@ // RUN: cp -r %S/Inputs/fail-chained-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/b.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1 +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt // RUN: %FileCheck -check-prefix=NEGATIVE-B %s < %t/b.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-B %s < %t/main~buildrecord.swiftdeps @@ -89,7 +89,7 @@ // CHECK-RECORD-B-DAG: "./f.swift": [ // CHECK-RECORD-B-DAG: "./bad.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt // RUN: %FileCheck -check-prefix=NEGATIVE-B2 %s < %t/b2.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps @@ -107,10 +107,10 @@ // RUN: cp -r %S/Inputs/fail-chained-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/bad.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/bad.txt 2>&1 +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/bad.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-BAD %s < %t/bad.txt // RUN: %FileCheck -check-prefix=NEGATIVE-BAD %s < %t/bad.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps @@ -123,7 +123,7 @@ // NEGATIVE-BAD-NOT: Handled e.swift // NEGATIVE-BAD-NOT: Handled f.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/bad2.txt // RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/bad2.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps diff --git a/test/Driver/Dependencies/fail-interface-hash-fine.swift b/test/Driver/Dependencies/fail-interface-hash-fine.swift index ae1dd733df7c5..2ecd51a5c0fe7 100644 --- a/test/Driver/Dependencies/fail-interface-hash-fine.swift +++ b/test/Driver/Dependencies/fail-interface-hash-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/fail-interface-hash-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -16,7 +16,7 @@ // RUN: cp -r %S/Inputs/fail-interface-hash-fine/*.swiftdeps %t // RUN: touch -t 201401240006 %t/bad.swift %t/main.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-SECOND: Handled main.swift @@ -29,7 +29,7 @@ // CHECK-RECORD-DAG: "./depends-on-main.swift": !private [ // CHECK-RECORD-DAG: "./depends-on-bad.swift": [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled bad // CHECK-THIRD-DAG: Handled depends-on-bad diff --git a/test/Driver/Dependencies/fail-new-fine.swift b/test/Driver/Dependencies/fail-new-fine.swift index b11374a4febea..7d8f82146ba99 100644 --- a/test/Driver/Dependencies/fail-new-fine.swift +++ b/test/Driver/Dependencies/fail-new-fine.swift @@ -4,20 +4,20 @@ // RUN: cp -r %S/Inputs/fail-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // CHECK-NOT: warning // CHECK: Handled main.swift // CHECK: Handled bad.swift // CHECK-NOT: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s // CHECK-BAD-ONLY-NOT: warning // CHECK-BAD-ONLY-NOT: Handled // CHECK-BAD-ONLY: Handled bad.swift // CHECK-BAD-ONLY-NOT: Handled -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // CHECK-OKAY: Handled main.swift // CHECK-OKAY: Handled bad.swift // CHECK-OKAY: Handled other.swift @@ -25,10 +25,10 @@ // RUN: touch -t 201401240006 %t/bad.swift // RUN: rm %t/bad.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s // CHECK-OKAY-2-DAG: Handled bad.swift // CHECK-OKAY-2-DAG: Handled other.swift @@ -36,10 +36,10 @@ // RUN: touch -t 201401240006 %t/main.swift // RUN: rm %t/main.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // RUN: touch -t 201401240006 %t/other.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s diff --git a/test/Driver/Dependencies/fail-simple-fine.swift b/test/Driver/Dependencies/fail-simple-fine.swift index 2f4f7595f1644..662b0a03d0b98 100644 --- a/test/Driver/Dependencies/fail-simple-fine.swift +++ b/test/Driver/Dependencies/fail-simple-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/fail-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -12,7 +12,7 @@ // CHECK-FIRST: Handled other.swift // RUN: touch -t 201401240006 %t/bad.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-SECOND: Handled bad.swift @@ -23,7 +23,7 @@ // CHECK-RECORD-DAG: "./main.swift": !private [ // CHECK-RECORD-DAG: "./other.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled bad.swift diff --git a/test/Driver/Dependencies/fail-with-bad-deps-fine.swift b/test/Driver/Dependencies/fail-with-bad-deps-fine.swift index f027a5b13caae..d63519cd410a4 100644 --- a/test/Driver/Dependencies/fail-with-bad-deps-fine.swift +++ b/test/Driver/Dependencies/fail-with-bad-deps-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -15,14 +15,14 @@ // Reset the .swiftdeps files. // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s // CHECK-NONE-NOT: Handled // Reset the .swiftdeps files. // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t // RUN: touch -t 201401240006 %t/bad.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s // CHECK-BUILD-ALL-NOT: warning // CHECK-BUILD-ALL: Handled bad.swift @@ -34,7 +34,7 @@ // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t // RUN: touch -t 201401240007 %t/bad.swift %t/main.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-WITH-FAIL: Handled main.swift @@ -47,4 +47,4 @@ // CHECK-RECORD-DAG: "./depends-on-main.swift": !private [ // CHECK-RECORD-DAG: "./depends-on-bad.swift": [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s diff --git a/test/Driver/Dependencies/file-added-fine.swift b/test/Driver/Dependencies/file-added-fine.swift index 7fd6a3bb13eda..741e0712cf478 100644 --- a/test/Driver/Dependencies/file-added-fine.swift +++ b/test/Driver/Dependencies/file-added-fine.swift @@ -4,16 +4,16 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift diff --git a/test/Driver/Dependencies/independent-fine.swift b/test/Driver/Dependencies/independent-fine.swift index fb8c3790b1d69..7663ac10c8440 100644 --- a/test/Driver/Dependencies/independent-fine.swift +++ b/test/Driver/Dependencies/independent-fine.swift @@ -4,43 +4,43 @@ // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: ls %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // CHECK-FIRST-MULTI: Handled main.swift // CHECK-FIRST-MULTI: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s // CHECK-SINGLE: Handled main.swift // RUN: ls %t/main~buildrecord.swiftdeps diff --git a/test/Driver/Dependencies/independent-half-dirty-fine.swift b/test/Driver/Dependencies/independent-half-dirty-fine.swift index f26194d9be471..04a9c48811fdd 100644 --- a/test/Driver/Dependencies/independent-half-dirty-fine.swift +++ b/test/Driver/Dependencies/independent-half-dirty-fine.swift @@ -2,7 +2,7 @@ // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -10,14 +10,14 @@ // RUN: touch -t 201401240005 %t/other.o // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled main.swift // CHECK-SECOND: Handled other.swift // CHECK-SECOND-NOT: Handled main.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift diff --git a/test/Driver/Dependencies/independent-parseable-fine.swift b/test/Driver/Dependencies/independent-parseable-fine.swift index 147d2611d4db5..ff935d1950120 100644 --- a/test/Driver/Dependencies/independent-parseable-fine.swift +++ b/test/Driver/Dependencies/independent-parseable-fine.swift @@ -2,7 +2,7 @@ // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -17,7 +17,7 @@ // CHECK-FIRST: "output": "Handled main.swift{{(\\r)?}}\n" // CHECK-FIRST: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "skipped" @@ -26,14 +26,14 @@ // CHECK-SECOND: {{^}$}} // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // CHECK-FIRST-MULTI: {{^{$}} // CHECK-FIRST-MULTI: "kind": "began" @@ -59,7 +59,7 @@ // CHECK-FIRST-MULTI: "output": "Handled other.swift{{(\\r)?}}\n" // CHECK-FIRST-MULTI: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s // CHECK-SECOND-MULTI: {{^{$}} // CHECK-SECOND-MULTI: "kind": "skipped" @@ -74,5 +74,5 @@ // CHECK-SECOND-MULTI: {{^}$}} // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s diff --git a/test/Driver/Dependencies/malformed-but-valid-yaml-fine.swift b/test/Driver/Dependencies/malformed-but-valid-yaml-fine.swift index 2e0edd7d9c6aa..b231c8719afec 100644 --- a/test/Driver/Dependencies/malformed-but-valid-yaml-fine.swift +++ b/test/Driver/Dependencies/malformed-but-valid-yaml-fine.swift @@ -3,24 +3,24 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -30,18 +30,18 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/malformed-fine.swift b/test/Driver/Dependencies/malformed-fine.swift index 1f77c7ce375d6..34f92709f2902 100644 --- a/test/Driver/Dependencies/malformed-fine.swift +++ b/test/Driver/Dependencies/malformed-fine.swift @@ -3,24 +3,24 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -30,18 +30,18 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/mutual-fine.swift b/test/Driver/Dependencies/mutual-fine.swift index a5d4610794e15..a85759ff05610 100644 --- a/test/Driver/Dependencies/mutual-fine.swift +++ b/test/Driver/Dependencies/mutual-fine.swift @@ -4,21 +4,21 @@ // RUN: cp -r %S/Inputs/mutual-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s diff --git a/test/Driver/Dependencies/mutual-interface-hash-fine.swift b/test/Driver/Dependencies/mutual-interface-hash-fine.swift index 36677de2493f1..035a3b57b77c2 100644 --- a/test/Driver/Dependencies/mutual-interface-hash-fine.swift +++ b/test/Driver/Dependencies/mutual-interface-hash-fine.swift @@ -5,17 +5,17 @@ // RUN: touch -t 201401240005 %t/* // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // CHECK-CLEAN-NOT: Handled // RUN: touch -t 201401240006 %t/does-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s // CHECK-CHANGE-DAG: Handled does-change.swift // CHECK-CHANGE-DAG: Handled does-not-change.swift @@ -24,7 +24,7 @@ // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t // RUN: touch -t 201401240006 %t/does-not-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s // CHECK-NO-CHANGE-NOT: Handled // CHECK-NO-CHANGE: Handled does-not-change.swift @@ -36,7 +36,7 @@ // Make sure the files really were dependent on one another. // RUN: touch -t 201401240007 %t/does-not-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s // CHECK-REBUILD-DEPENDENTS-DAG: Handled does-not-change.swift // CHECK-REBUILD-DEPENDENTS-DAG: Handled does-change.swift @@ -47,4 +47,4 @@ // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t // RUN: sed -E -e 's/"[^"]*does-not-change.swift":/& !dirty/' -i.prev %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s diff --git a/test/Driver/Dependencies/nominal-members-fine.swift b/test/Driver/Dependencies/nominal-members-fine.swift index 637298694bca3..a9f36d3855661 100644 --- a/test/Driver/Dependencies/nominal-members-fine.swift +++ b/test/Driver/Dependencies/nominal-members-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/nominal-members-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled a.swift @@ -12,12 +12,12 @@ // CHECK-INITIAL: Handled depends-on-a-foo.swift // CHECK-INITIAL: Handled depends-on-a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // CHECK-CLEAN-NOT: Handled // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v > %t/touched-a.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v > %t/touched-a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-TOUCHED-A %s < %t/touched-a.txt // RUN: %FileCheck -check-prefix=NEGATIVE-TOUCHED-A %s < %t/touched-a.txt @@ -26,11 +26,11 @@ // CHECK-TOUCHED-A-DAG: Handled depends-on-a-ext.swift // NEGATIVE-TOUCHED-A-NOT: Handled a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // RUN: touch -t 201401240007 %t/a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s // CHECK-TOUCHED-EXT-NOT: Handled // CHECK-TOUCHED-EXT: Handled a-ext.swift diff --git a/test/Driver/Dependencies/one-way-depends-after-fine.swift b/test/Driver/Dependencies/one-way-depends-after-fine.swift index 310e4e6b8539c..115717e731e6a 100644 --- a/test/Driver/Dependencies/one-way-depends-after-fine.swift +++ b/test/Driver/Dependencies/one-way-depends-after-fine.swift @@ -6,25 +6,25 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled main.swift // CHECK-SECOND: Handled other.swift // CHECK-SECOND-NOT: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: %empty-directory(%t) @@ -32,25 +32,25 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift // CHECK-THIRD-NOT: Handled other.swift // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-DAG: Handled other.swift // CHECK-FOURTH-DAG: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-depends-before-fine.swift b/test/Driver/Dependencies/one-way-depends-before-fine.swift index c7a081c10aa00..3a19bc78b8f54 100644 --- a/test/Driver/Dependencies/one-way-depends-before-fine.swift +++ b/test/Driver/Dependencies/one-way-depends-before-fine.swift @@ -6,24 +6,24 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-before-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled main.swift // CHECK-SECOND: Handled other.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -35,22 +35,22 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-before-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift // CHECK-FOURTH-NOT: Handled other.swift // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s diff --git a/test/Driver/Dependencies/one-way-external-delete-fine.swift b/test/Driver/Dependencies/one-way-external-delete-fine.swift index 12304986c4ab8..e86a46b512d43 100644 --- a/test/Driver/Dependencies/one-way-external-delete-fine.swift +++ b/test/Driver/Dependencies/one-way-external-delete-fine.swift @@ -2,13 +2,13 @@ // RUN: cp -r %S/Inputs/one-way-external-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled @@ -17,7 +17,7 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: rm %t/other1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift @@ -27,14 +27,14 @@ // RUN: cp -r %S/Inputs/one-way-external-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240005 %t/* // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: rm %t/main1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-external-fine.swift b/test/Driver/Dependencies/one-way-external-fine.swift index 771796ffc72a6..6135e0bd10c01 100644 --- a/test/Driver/Dependencies/one-way-external-fine.swift +++ b/test/Driver/Dependencies/one-way-external-fine.swift @@ -8,13 +8,13 @@ // RUN: cp -r %S/Inputs/one-way-external-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled @@ -23,7 +23,7 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/other1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift @@ -32,14 +32,14 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/other2-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240005 %t/* // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/main1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift @@ -49,4 +49,4 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/main2-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s diff --git a/test/Driver/Dependencies/one-way-fine.swift b/test/Driver/Dependencies/one-way-fine.swift index afaf4d3bf84ef..ecc889bcf651f 100644 --- a/test/Driver/Dependencies/one-way-fine.swift +++ b/test/Driver/Dependencies/one-way-fine.swift @@ -4,34 +4,34 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift // CHECK-FOURTH-NOT: Handled other.swift // RUN: rm %t/main.o -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: rm %t/other.o -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s // CHECK-FIFTH-NOT: Handled main.swift // CHECK-FIFTH: Handled other.swift @@ -41,34 +41,34 @@ // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // Try modifying the inputs /backwards/ in time rather than forwards. // RUN: touch -t 201401240004 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240004 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s // CHECK-REV-FIRST: Handled other.swift // CHECK-REV-FIRST: Handled main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s // CHECK-REV-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s // CHECK-REV-FOURTH-NOT: Handled other.swift // CHECK-REV-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-merge-module-fine.swift b/test/Driver/Dependencies/one-way-merge-module-fine.swift index 8548ca9e36459..de41a215d5502 100644 --- a/test/Driver/Dependencies/one-way-merge-module-fine.swift +++ b/test/Driver/Dependencies/one-way-merge-module-fine.swift @@ -4,14 +4,14 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Produced master.swiftmodule -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: warning // CHECK-SECOND-NOT: Handled diff --git a/test/Driver/Dependencies/one-way-parallel-fine.swift b/test/Driver/Dependencies/one-way-parallel-fine.swift index 3b251ce6b1324..b5aced8140697 100644 --- a/test/Driver/Dependencies/one-way-parallel-fine.swift +++ b/test/Driver/Dependencies/one-way-parallel-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -32,7 +32,7 @@ // CHECK-FIRST: {{^}$}} // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "began" diff --git a/test/Driver/Dependencies/one-way-parseable-fine.swift b/test/Driver/Dependencies/one-way-parseable-fine.swift index f1287332305e5..de2d0d4edba60 100644 --- a/test/Driver/Dependencies/one-way-parseable-fine.swift +++ b/test/Driver/Dependencies/one-way-parseable-fine.swift @@ -2,7 +2,7 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -29,7 +29,7 @@ // CHECK-FIRST: "output": "Handled other.swift{{(\\r)?}}\n" // CHECK-FIRST: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "skipped" @@ -44,7 +44,7 @@ // CHECK-SECOND: {{^}$}} // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: {{^{$}} // CHECK-THIRD: "kind": "began" @@ -71,7 +71,7 @@ // CHECK-THIRD: {{^}$}} // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH: {{^{$}} // CHECK-FOURTH: "kind": "began" diff --git a/test/Driver/Dependencies/one-way-provides-after-fine.swift b/test/Driver/Dependencies/one-way-provides-after-fine.swift index 37e791282556a..bf4466605e15c 100644 --- a/test/Driver/Dependencies/one-way-provides-after-fine.swift +++ b/test/Driver/Dependencies/one-way-provides-after-fine.swift @@ -6,42 +6,42 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-DAG: Handled other.swift // CHECK-SECOND-DAG: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/one-way-provides-after-fine/* %t // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-provides-before-fine.swift b/test/Driver/Dependencies/one-way-provides-before-fine.swift index 06207033351ee..5f00a4e3d26f6 100644 --- a/test/Driver/Dependencies/one-way-provides-before-fine.swift +++ b/test/Driver/Dependencies/one-way-provides-before-fine.swift @@ -6,24 +6,24 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-before-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled main.swift // CHECK-SECOND: Handled other.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -34,18 +34,18 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-before-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/Dependencies/one-way-while-editing-fine.swift b/test/Driver/Dependencies/one-way-while-editing-fine.swift index d05a3f14a95e5..e2be06aa56fa7 100644 --- a/test/Driver/Dependencies/one-way-while-editing-fine.swift +++ b/test/Driver/Dependencies/one-way-while-editing-fine.swift @@ -12,7 +12,7 @@ // CHECK: error: input file 'other.swift' was modified during the build // CHECK-NOT: error -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s // CHECK-RECOVER: Handled main.swift // CHECK-RECOVER: Handled other.swift @@ -27,7 +27,7 @@ // CHECK-REVERSED: error: input file 'main.swift' was modified during the build // CHECK-REVERSED-NOT: error -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s // CHECK-REVERSED-RECOVER-NOT: Handled other.swift // CHECK-REVERSED-RECOVER: Handled main.swift diff --git a/test/Driver/Dependencies/private-after-fine.swift b/test/Driver/Dependencies/private-after-fine.swift index 0a002d35f4199..1b85933b1112d 100644 --- a/test/Driver/Dependencies/private-after-fine.swift +++ b/test/Driver/Dependencies/private-after-fine.swift @@ -6,18 +6,18 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/private-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL-NOT: Handled // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt @@ -35,13 +35,13 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/private-after-fine/*.swiftdeps %t // RUN: touch -t 201401240006 %t/f.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-F %s < %t/f.txt // RUN: %FileCheck -check-prefix=CHECK-F-NEG %s < %t/f.txt diff --git a/test/Driver/Dependencies/private-fine.swift b/test/Driver/Dependencies/private-fine.swift index 1d3249d74bb8f..3ed93c79568b2 100644 --- a/test/Driver/Dependencies/private-fine.swift +++ b/test/Driver/Dependencies/private-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/private-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled a.swift @@ -14,7 +14,7 @@ // CHECK-INITIAL: Handled e.swift // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt @@ -25,7 +25,7 @@ // CHECK-A-NEG-NOT: Handled e.swift // RUN: touch -t 201401240006 %t/b.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt // RUN: %FileCheck -check-prefix=CHECK-B-NEG %s < %t/b.txt @@ -36,7 +36,7 @@ // CHECK-B-NEG-NOT: Handled e.swift // RUN: touch -t 201401240006 %t/c.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-C %s < %t/c.txt // RUN: %FileCheck -check-prefix=CHECK-C-NEG %s < %t/c.txt @@ -47,7 +47,7 @@ // CHECK-C-NEG-NOT: Handled e.swift // RUN: touch -t 201401240006 %t/d.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-D %s < %t/d.txt // RUN: %FileCheck -check-prefix=CHECK-D-NEG %s < %t/d.txt @@ -58,7 +58,7 @@ // CHECK-D-NEG-NOT: Handled e.swift // RUN: touch -t 201401240006 %t/e.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-E %s < %t/e.txt // RUN: %FileCheck -check-prefix=CHECK-E-NEG %s < %t/e.txt @@ -75,7 +75,7 @@ // CHECK-E-NEG-NOT: Handled b.swift // RUN: touch -t 201401240007 %t/a.swift %t/e.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -disable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-AE %s < %t/ae.txt // RUN: %FileCheck -check-prefix=CHECK-AE-NEG %s < %t/ae.txt diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-after-fine/main.swiftdeps index ab68f2a75146fd48893ba594c68a57f7419ac818..c00e208418ef20355cadfc0bc66faf469376d166 100644 GIT binary patch literal 408 zcmaiuy-&hG7{=e8d@jV8xSxqJ9M{r9X@dy^R&c_^gv8l?CYXpu46dXyGB_|YICOAS zrw$C{aOlA3U*gQ*ONg!xcf<4io?qTp`=Tr505||-rH@5ov5DXbVe7E?Cip~@8iyx* zN|Z5SWBkSPXeIbpC{HXzSVZ_#sLvK#2z3_9VxV#bUx%LY;?vjVa1P9uXxHJpOYu+a*MC8exs5-vSP<08G4@c%uc?UPp|c z661O=^(pP|=5rb8y_qLif8&GhV=s81L;rrzyX{k>tSg>Bq{U9>@|*@n#k5^htGY7X za;|-7|x#?gVbd(G0_> Y8;(~qO}lQoSpw<87X6n^1Ef$5KiOq^3jhEB literal 795 zcmd5)O-sZu6ukFW1U&4irCYb9^ehX4EM7c`hkQ(yuxS#LwCcaNO)C_{gSZECNFFaU z@4cDih8&eae)e=a1R2XL&-09GeX;_f%LvKI1s`)TuZuFGTf$`zcJLfWrSa(Ps03CZ z4GuhRpvpveN%+~2{$h$m-FN1jPVUec8ctE{k2 z6#XzOxRxos)97I$jmnzTk&u7k%>E~5{$xzF?g1n8s`Q$lgr=I`UbyqH!J&hr zI(1-Z9u6HC{Y#t~e1z!gaPM%=@0@!Z&8xN`0#E=*3m;Kzk}0DxlC__GV|2=Lwc|57 zLuG0m?zNdIsT3oV|l(G|T=POsyZ@-vs8 zpA=koLby~_THBz74lF36#~X?MM`^OP(wtS9VC*A$G&AZYzsX9A^EHn2Z$ZxN>h08LSBz diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after-fine/yet-another.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-after-fine/yet-another.swiftdeps index 463b4dfae1c71b24c0e092e4bbd62c902e1c9f80..becd8c3d80bce7e4a30b5d30a8a7b4d72e0a1e48 100644 GIT binary patch literal 420 zcmaiwy-&hW6vbbk^0gRa!d?<%c)XUjv?XoAfEAoDF(F~L_9J2<7$6XxNM&SjU}SLU z;HXX=7|6q+1EYV5GlQ29U46-Y!#%%q?#->$FPmH%A&L-6aUaXrB2z|VOg2IOjnOG9 zRE|&S42u&?Ch)V>$(qrxK$u#9kPy=ulb$WIWYRnkCRli3Qp6~9DzzsP26S$b7z?pg zh_JW`=mL`&Tb*wm7Kt!fGiedf4Rj$apdl7RMx(!sYP|p`SVNE@=~qCxD}+qg8N1^p zFTaine}?tjqy0}VdzeWlx%X-YgZvGJnxnQq;D=tX-|lvJy{L+=H{|n;M(cw2b){@O zWx3=C{El-}(^nPWyLJh9(^-Tbyn$$Ux`P|9SL|=IT<^ZW)!=U0o!#yzkF7)!;p(1@ oY}-?{lBwyArW>v-8@6d0rfb6t#gNTX3Zulq4*i!+1)dlQ72F9*<)%uDv4J%;CIy(>sA1)#1G}2PH8A z!CMqz0aX;xwIIF$!VHOz1!A>|R053)B4bAk9LR)Mbg6$=ZIEdF1a1}W&{;PWpBVsn zT^4n@7UjBaLSDxWB$y)L+q0KC`FrV);0udIM2oCkK=h5^ zOTy-Ib+t`cEFf$xjiullq*x}nPjp}M;IE@v&!H8gKFZkiD?p|VVB*ch_Ci{C^%%V* zrQ3t}r*gEPQj^MiHAPVV#)0Nz-+iDHXEg2)2egzg>b5hX*+!#vP2G}N?)1uq)1F3m zzFzU%Et;;=wHapBG{9Y_Kgf@_CAM=vMuz`7+d{M3QWby>`VvVX)mRL=jyoJV_)7wb X^bY;AI3zLvVGKNR2+&r*!!*DT23T?j literal 1162 zcmchWOH0Hs6ovQw6&GC0s--h_)wK)=GPu!=xJa9mAx!fyNvr;Q`-o5|1!qRhBDo~z z-rSFq+|XWXq({g4g;SR&X__XiX%2?NmkCiyCwvaUFiukQatf!}o7UCX%Lb3mbdnNyrz*d8Cm!p_|qPX4DjKQi%BrrR~9tB``R59n~Y XMeBc(jSVlnDbD2(tno;)EK9xs=n*jj diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-fine/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-fine/other.swiftdeps index fdebaf57ebfb4aab27e919a0a84209c4901c0cbf..536f71123e364ba2a263dc74c7f297350aab94c4 100644 GIT binary patch literal 416 zcmaiuy-&hW6vb~ZAZ1Zw;$9PDc)XTUumutZtl)%+35m0%9}x#JKyW3Mk->qH!J&hr zI(1-Z9u6HC{Y#t~e1z!gaPM%=@0@!Z&8xN`0#E=*3m;Kzk}0DxlC__GV|2=Lwc|57 zLuG0m?zNdIsT3oV|l(G|T=POsyZ@-vs8 zpA=koLby~_THBz74lF36#~X?MM`^OP(wtS9VC*A$G&AZYzsX9A^EHn2Z$ZxN>h08LSBz diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-fine/yet-another.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-fine/yet-another.swiftdeps index 6c6e6bd8f844a45e7b68158269c57185264c20db..a9ff90ae9f81aa286a0c7c93c86eca08631c872e 100644 GIT binary patch literal 420 zcmaiwzfZzI9L2Av{924LVK0d>9M{s8QfdLqu>d!P5d-(0nJ)ew>hQG`%J_*h0ZnQ$6mvI(+poKASI ze0)ZySRP|ChL^8S)|`F?(!>UYgqTjb@@$hOS7w1U#?lK{=A433u0D}4pfj69Sc>f2 z9Lt-4E-;z$)x|bplQ|}9t}Ft&0Ts#u8e%!*bpF>-spSBLXb3hm{Te89jgSR9V{fz+ z)z=Xb&#`fPwEroj4^zpw@Low_u)pD=#zWg5h(p%vx4RwD$m_DlhGMo}Z(fSNp_QCg zNiDP_amTfE%hxrZxgLRRGL6t98^}(lJGf!Je1F^JvHSkkgMTaDIqi<-He+#wD|;$Z oi@M=6-}Fq)R1LGpJjb;PrlFn|EZxh($ literal 815 zcmd5)J#WJx6x{tQkUC_tWjnUqc&;LKiMq5))d8C$L9rhcaN7L)`h!Z5q7G3zlmVXL z?!g^*$F_k(kcg0@6J`z<|WF(Nwcnmb16{ zNV%ZSg@<`NOhW$3o8ENjL7sc1X}*!M|71}1lR>}ohjg!qcR}y%i7EOqv{~~K8eHWj SBx+mm>5|YbFRgsGLlw(>7LY=~+48TW-ppeZ(Ex31`ZXZi1u*f=#P&i- zdG)AtPW0=;_@{7ukQS4|dp%9i{>B6C$ASAGjh*|^;C3kKMXg{vV=32abuJ}WSB+lZ zP|AH-+UNRO)zwtjv22R0m;t!y4Ti;0RAM`KBh>J}Dv_vK9Z>-2MLC>LI1@=A^_T*^ zileKVRk3uVs#&h#>WXdj6wfp9brmjEjgQW3 zmB1)u-eMIFq)G>Ll2u=V%5;X^fnqX=u9`J?;0Vxkv1R^U$so}BK_!)5qqDAibuVQE zX;E^*>HN0jaxQ5u=2b3eS#U~beDL!4)}pR()ixYm=a>&>fzsdKp+zm8tkDa2f!P$u z6ezq70_7u|k8uUp_8fnen#R`Hpbji3qlX^>{zZO@vHXyWGNVnSG^-=&>8(QgjwtwZ zeBh{IVk;e$dp3rXUlr$9qH!J&hr zI(1-Z9u6HC{Y#t~e1z!gaPM%=@0@!Z&8xN`0#E=*3m;Kzk}0DxlC__GV|2=Lwc|57 zLuG0m?zNdIsT3oV|l(G|T=POsyZ@-vs8 zpA=koLby~_THBz74lF36#~X?MM`^OP(wtS9VC*A$G&AZYzsX9A^EHn2Z$ZxN>h08LSBz diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-fine/yet-another.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-fine/yet-another.swiftdeps index 045438f5550d62b58e0fa545b666ddce5b04c61e..f49792b949a856c54fd6a0492089de6fee17b9b5 100644 GIT binary patch literal 420 zcmaiwy-&hG7{;%sd@aV9u$RObj%#Ua`D(&|6`U|JAz>DJ*NBN=fMDE6Wn^$*WN_%< zs7@Ui$l=g|(Z9r*!IuzSz2t6qp5ODlZ?0OqYDjT}C_*SEeJn$pOa%=w*?8$UL8l^9 zK0c!}tWGeQz$;cKYeBy}WoiRLd`xFTd$!3^Xmd}QVC6+)#)1TW+aMmWlu+z oVKQ#Ciw1XdC6;rFrd}vnF0(9F)GeLIFp3=P(0|!T3WmV>0iH#EcK`qY literal 815 zcmd5)J#WJx6x{tQkUC_tWhYi0d#)mNiMq5))d9nipx6%=aN7L)`h!ZAq7G3zlmVXL z?%*AF$99?!A1ogh$U zcO8UZKs9+-#l<&3m|^2{fmp2qm3WHDpPJlYum diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members-fine/main.swiftdeps index ad8a56b02c2e39ae196ce401911ca08ccc923431..b43c0bf3f82f1edfac625119f095bf94c8d89b46 100644 GIT binary patch literal 492 zcmah_J4?e*6h66qq=JZuf@1`c-rmGCjfpKd)M#C-P$+b6o>0LmR;pu(9XmL5bm)-5 zQJpe4l&eFBj{Xwo4xS=DHivu9;d}9M4lA{~kO5!-APUdpiA4vTO$eQZ*+Jh!*G z&xS643D{@?9AjtV^~O^E zp+}_yVw|od--Na0g-lv_DlZVEKkz~Qx)oeWUH`JvI&VwHwyt=7SISnajT0#_G}Cs? ze8H8aFP*EG0$mGy$D`=YECHO^t@d_j9^&~I9mMcnJ9AKT8o#^!XTND=1OR*P$9aP@ zl?GBy1J~4vqI%#49fKNvwh++T$ literal 1848 zcmd6nJ#T|B5QcYt#Yr8q016>MlDUf1CF;^HRR@F5krixH8`AXOmk(EpL{Ul_q%eSm z-aGrbd(RKBa+Rgle3ayVOkaAa*w*ub=FQw z7pou%!gR%AWYIc|;$)4hG|WGbsacwlTl>m=@AQ*^rcX818=Z! zVd+BTLhM2U@2!j*i)ifWN?kQHwJYGvbphO}AR&c_^goN4B*G5bP0|Zy{WMpt)WN_%< zs7?$FnK&y0u|9v*rMszfWsSrGjTJbgSle7 z4zO~8?7M@VPbs;dkYmz&DS?FjEe2|j&7i0B{Z6;pZYg#qt5LtNq^i~Wl@i!y-u3c^ z<*CY+^Rk5?YX*LUVv&{i0NTASbp63~FnvInhsth29J-+urzxK+=Y6yot*wzbNs|N49Jt&DI zkOzk%PN2#}^fecs0Aaht+XS&#j8wxlPKW?DKBF(ftE!_!7ZR*iW{2MSuIzwij8P#e zFBzA#E{WLk}HKWgoXik5SVz7$jxMfL&XZwoO1 diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members-fine/yet-another.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members-fine/yet-another.swiftdeps index c279ebaf043ab71881b565d8b587b1a049709a67..fd1bac5a8aeb1a94210f1546839964987ba43fff 100644 GIT binary patch literal 420 zcmaiwy-&hG7{;%sd@aV9u$RObj%#UaDIW;~R&c_^goN3)*G5bP0|etnDkFmfBZET+ zM|JAJKn{lvjQ%Cg48DZu>Lqu>^ZcIYeRK83RZB=BL=i#>;bR$@WXfrT$;QvVaXRI> z>hT$!VR?ed1YW*6S#$d3OH&gN5@0&x%Ckw9T$%gQ1WPYm2{{F&T7M#ePv<6yuoRiO z5X&2%E-;z#)x|bpk`R+MR~A0qfC^s|db8Orm?SBgC!&EXZyw_3~>~FZJ_0aK#;>hg}I=!xF?8s`I5sYVoQjN6nlYvJMu2ZKLMS=Hc`BxHlqlM{oM&$a$6+TGJUVld0uqpU z3p^~K5(BuN@oxY(W+8Yst}t-l#%7(eE{UJA9M$9Bo=X7K<^*!!2*gWYp^9RWKCY< zk@QKOPY(-jn1uY5H`*%DfPn>RFy2VWe==zH?FWN?Y>|WkD>z|dLgH*`dl3gU)Zj|ajtmZr3=SO} z)u{smIUG7L`jh) z{KI*b8mkyA==wxvb6Wsj-wm%y;i|^#SUG==+=%*v+5blc6~c= QtIYQNuAABXA1BYiH}PkBVgLXD literal 595 zcmd6jK~KaW5QXpk6(k<^M6+$Qb$d3Oc-eUIWIRmav65{8fv)=RrL-nJ8xL}T$?&~_ z_iorx8}PHIbVzpH7o78ghT&u-LRT=x*#%#7F|Ug@vRle!4|ehbM?K)l+pCsXK?)8c zZcuF^ydv=f2%8$88)COxrG`dqgp3JK;jIiGT15#LGN!aS!#khGE^J%laHnpms`|ry zUALlA4ao-7sz%73vMS(xf)O}PV-KH%``ngL;qd_uMm{@hI`+cYYrfH8wH4MMML*3B c{wkEw4H#h}MQu%fG1>hW$yC2erYy_i8^4aC6aWAK diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps-fine/main.swiftdeps index f8db87488755d62b8b8c8adc26a661cdeee5215f..90c08952efcd808f61a5907c938fc769594617d4 100644 GIT binary patch literal 392 zcma)$F;Bu!6oqe}g0K){;{HsG;qh8Zi!G8cU%+XqOcfz&rjP%(q5B@SJ~=v0qPv*H=Tc6~c= QE5i2tj+@H;kHa(Y4a|pm^#A|> literal 593 zcmd6jKTpFj5XJX=ijx>RIcg$EXy&RCOU1&37##b#vKs%vb_#rZ5+_KR5d$91r@P;? z@7^7qv<15aK3$S-`+_l6@L@PRiP#lHjIQ{allfe=mEDpqF}g7bob-U_;BH!C1$p!k zX@hE;5EK_bfN)dcb3^QQtJHFXjgZJpvz75ft0duLrj)i91RthX7qqQ$cu@Des`|rY zUALlA4VMjgs~RDDo>dX=BdoxAG(Ey3+~=}{icd#)Soz|e?dX;0Eq8QWw~FgPDU9<1 bf8~ks0}O29NjsZ=B>ES|RKGH&EX(2>ESI4? diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps-fine/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps-fine/other.swiftdeps index 08e363ec1de1ab0771796bb6a7bbc8034e6ed90b..9f9f8bff887d6da1f70862f2c4888dea839418b3 100644 GIT binary patch literal 392 zcma)$u}{K46vkgqL0Ht7xSxqJ9M@7>Y>|WkD>z|dLgH*`dl3gQl;BEEMg|8)28Rxg z>ePXO91a~A{Y#t~JYsZqcyIW=-}k*&Z(O#N3;+dyE#-ZlIAknng2;;JUIiVCeD&~@ zPLMW2WF)s(94!U?r<+bD>YUIzsBR&|^WRQmsFdh|{S<5~LM&9Y}O+x6|h QEi>Em+iq(6f1Er6-}n7`a{vGU literal 595 zcmd6jKTpIk48`|;3QG((rMgzoa-GphEGHHw#E>R0M|7H^@zQkNXF`ZfcHPNo#3myWbivn@Oy^=*H%q$2=!T$hv>l#;yIPGEl+i<_ z4Qe?d7^!{$<;KG2hS=>^Da#%kA(2aO2zmUlCTaLMW5)6s!H03|!qz1Ycji_WMSHj} z%UTttlDdMdO{H`zXH~@e09H5+eTy&(_j6gp#K#ACuzvQA8+svnojW$JYsK|PDGbvF be`QMVJM`crlXX15Nc2CPDSqWlp6A&&<@TaB diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash-fine/bad.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash-fine/bad.swiftdeps index 527f7825b3eaf1653d73adf5c2d9ddc52c7ea3e9..36923733d1d0f303fa6512e9086ef7c7309191ee 100644 GIT binary patch literal 368 zcmX|-zfZzY5XY}qKo~T}#Qm8V!{fCSB#@XeU&X-Kb9kFb)d2_|Qa z(wSE(dTz(zluhpfblOgSxbAS=hvAy(e+-f-z?!Z@$MyOHm;Q&4+}ofnO9CV!9ehjx HGRpn}`#)|0 literal 951 zcmchUF>Avx5QTUDih~ZBY}|D7Tmpp>x?~C+Wa%l0*e6Aj-S*$tmR&Hk?vk_`q(k@a z-F@60?F=J7c`-bS`ZCM&JQGc`w+f-kh;lmPV+_V~Hms^CobF&dFR?QXUcBv%!YmZQ zLB@sDaD>-FehH)0D13rVC6pWvMzOebXxZT(~&aOuDj z`>w6whjf`r6m)ocgafOCvs}@Uw)C1(Cd{*kxoz~_=yfad)-`CsQAA@obtL*f{QEWh otLUS3&*;(2I5%E*a{ac*?HWn>w2)o{16snOmsdIV>qs*Ac4e$0V_CRVnX69&})JN7;11OCnJLcBZET+ zM|JAJKn{lvjQ%Cg41R>ja5p^f`#!l`t$y1yQUC$~_KdGZZ5UsTm zbL3OKyxuGv9wJ|9d#=QqD9Mxv&bfEd%^`6*J4*YJv$4a@P<;o$;G#Ym|%qtbjtxh?A-Z9y> z*C}3j#eyf>E~jnk7{HZ}vgi8!Uc2Sy{Edu=Pgx9r5G0a-)mRML((4Z-{UbtRe~Wf3 J0T3r0`~jF1a9;ob literal 761 zcmc&yv1-FG5Z(0^2OTomq!~SzK%s;#ok9lLdI}=4r0Qh1{rk$Y3x?vUfohPByZ7F4 z@AN=N<4|3r%#WgRFRH2%(%O?(;6@Ntbi>yaOy_2tYUXgh*$=V9(OA4jKN^JvC^?`@ zE2wb^QOoWJ(D|JBTp@P5h3aIF6_H3Gz$x~wm8#|sqf^dsL2Ki#h#_Y6nbJc0IQL+@ z4{#k$L*F9i^1e_MG(SHT$+zHLLuWeBrIZXWL-5i+#bMIAmj!*W=;4w~#=Fvy=pTG| m-16a1HY6WjFv2c#-SY$Fy%*JA8$E1IvawGsEko3GEyOoY2+cNibI2M_?Tt9{L5n~#-G@9-^2i>(%CSWlg0qLgP(YkrG5IwHF>rF|~P&Mr>yzG*?p0 zkWbX&YMroognX&2nG`FcR3=4;W~fB8?WoqXWTj|GGBy1RaC`?~(9P%!=Pds|?`WUZG?M&F1I_2I_rwNnKj`*+R>~Dk#~rXtqj7u9yi%du>Xh?m9fNIr zo#MGyEO>6);gr>n037$x^_`&SKeW1jE?Bn_3P4W+tWjzQu$o9f+x2>Vm;Q*5+S{Nl JO97A@;19}zaa{la literal 764 zcmc&yJ!``-5Z(1F4mxDANi%vbfkFvgI+YHJ^%O*8N!7`2`|m5uDj15V2C6|i?%sR% zr8_zrhvpJxeiTi6(KL;a)}FiqcY>&)E52r9K3C&Zx0uV#evCbi#^O2p$tYBy7g n{njA7EF6DHW&*e$=ny!j&gYo~{;RyH=OrDce=ZH4#-l4{Pu diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash-fine/main.swiftdeps index 43ededaf30de400d907f02df19537e9ff4ce3783..dad602b6f208f13817c9a1b9968359373b658a2b 100644 GIT binary patch literal 368 zcmX|-F;Buk7>2)o6oiEs6ZbPQhT~ca5=cxKu!0jNCM3=RZ4*oc0|r)dGBP+YGB|W_ zRHqIM&Ee32(O=@s;75oIcf<3(?~}{b>bFfT2_OLAK>G?Ko6nSpkZ)w>Ly4KnR!%R) z9L*{6Dcx#ywpQXt8Z(YB$L8N(^n$cJF4|8RcY!|Os4+;PVNB=dNVqckmcVeoLyn* z;Yk11jt^7Gg!WlYA;rIRpgHb(&urulhTVRTm2ySXaYroEXx!Z}uT&_vI_3O%$6&i& zr+DEN3!d9{IBk<@fX7z1mm6*+j{7turterh0a%U2pzV77flL2~5Kr&Wp2Y$5Fa{IU I0U7!J05&0R{{R30 literal 955 zcmchUK~KaW5QXpk6_a?_6HQ%jJ)2ET%*Kl+u2wPmjOoL zIP@p@lx}i~gbH`Ja4_=GS<})J?ddtEbST4z(l`2H^4bc$cO80|$fLF~{lVcBiYKR<4sZZr?Pa#G*+B9Iv85M#l6)ZJxvc{} zq(q-sUu`+xev|y&GY7V^FrWBPS`RjxNo(YpeKN<=nntwZ5C$ zshh@+ub$a+Gig`U9Hz4R8j!SVRVUf`YH>uX13dsJ0zC?puA0?uxzQEv>ebm@OX%ys z(REi`i1t4UgjPWLKmax2Hrqn|I*4!xVM1v2TlnQ6AUF%4M?p|ULr)v4BQ)R>q#%8~ literal 1398 zcmchX!E1vs6vprV6%TgsQl0JEi{~K}O6g%cjUA$SDWNgRlIYg|eo-?JhLp8+Ihded zKJxpXFAq>~iOJCrKT&A2C`pot2(ecbZ5{z6aKdx9=*Edlnh(q2X;ot?EV#gfQ7xw! zgv4sB+(^o$L&He*BdC;r@ikJ!ao8$JjiZeKar#&in%Ym!97SyhA>;ChMjLNDs7qwZ z4E7d38k808o4Q2fKWDu+MP|3ps8P~atz-^wuv)-o0c&{g1>6P-8xG)1(>dNNgIWu$ zQ99zdk^%RBgIG=laZ>_L=^eHx0@6K;?C-Ji8E9GjpUoD;W zHFf9fo9C`scAcKhD4RV3C>pkN?+k5E9}V?h*DiY7Lef0qG^JtDD+3UMR2r}@%g}S& f(b%CsRUm_q+S{q*`PEYZN-Tqq3SdV9U!qw*`GRxl literal 1188 zcmc(eu};G<5Qg_Wg(Ze8IE2zEBdRJPp^AkGF*xz>%Bo`<+X?XYIEgDof(+1Bc(70B z|L*kN*;iyMHR#^4cyQ8}8KpF1O6?4XuQEa?IpA|JhINpdSCcvI-gK_PRw_I>(@Tyd zWZt3)GpW=8PO#=EXiRi`%oKT^LN#kK3nU~jZa6G7_ta=wGhX<2DMIx5DMm=WhqEr$ zI0n`b#!a<6-a6<8yRNO_qM#fLaR~pg8S_3{qbu@4R@Y=rUdLPM6OT_BgX@NL=jujl z62)o6ex=^CQdFjF^1z>3KB?67_fp9Bqk)z{AinCA{c6LZ7L&!10#b& z2S;^cU}z494vhXK&J2DHk>PH5-uHcSxq9QaEhzvT0MgP|7@2G)c!X^0XFmj=iCp#U ziqBD>BAe1J*5@0+e|&9bQiTP`=fZe3StyK!uT4>V6UI_-BGvi}3w*vXS%g|-=9Z{$ zeZE3A7wemNVX`H%jWAX|-x4L6&jZv0!IyhSt&yWDO#_O_^dG=!2cSf6M#~G;!n?=R zYb@U%$=}lPVMa+wpS289{7VPg&jaU4o!Db{FdC}md`Y+LiJEOT?^>!;E>^nzO5vif zsk>gkbm^3ej@`2uZIu&%ykXgo_RwsiWD2mBNI=ha eMq``)RE9J{@?b|{&yxUhm;euDz>WkSY2Xhp$#ks% literal 1185 zcmc(ezfZ&<6vy}e6(kN_q}KDM&gK#my|_3T2M)em$WcI`RsVZwi%Aphpm!G;fV`i4 z-s4@6jWVEn&(a}CUl)|pf@!_A0--4gq2z#%;WDg)GNPHT(;jT+IW|h;(c4}LWJ4Al zc$}Fk6X7M}Uk2PJ!TZdjEVHX&EoP2{l+~4hgAsvRL)-MyD!eHflQ2w9Qkgxx^C`*X zxr4NRN)_<_yn%gH|zia diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps-fine/main.swiftdeps index 5844ed2c32e396173bcaf0325b703983948c8ef3..898b323f45903e3bd5c10f993e41d7bfa89fbd48 100644 GIT binary patch literal 424 zcmYk0ze@sP7{{M`Jo8*ag!T&}e0@((6NSRTE)@cUz-aczy%&b5oMN=e<>=7h=-_Ze zV>R92Ag>J$j{POg4!tHu!}AQE?+?ED!gX0v04M+iq>uU1AR|tfNY+l|jnfg2W{=M4 z7-K^uL-G0Ic*W_Lqm2w5D&?U>obS01r=oubus30>iu=(3Q=JdQCG;KX(zy81>j6}~Gl`SB zrfz-p)Txz9TC8RgkySzfas8p%XvMpm8k2RpiVUzJN*Lg>)nj+eE;V}0t~PI;I&7OM xHrv(SKkDBD%=vs!V^-T1o&Z8XhJYXZ`@h1D`vK&+4+ba$RwNimQ!zpU_yG)?e!2hv literal 1402 zcmchWF>Avx5QTUDih~YbV%JTR#d9$PLg>&=rGsLff`}}slI%ABzOt=?p@`5Vt_NAj z?;iT@{O+LQ60?IL{zaiHk}S&-BE(Knv}FR2!4XgWrhkrH(sJC6t5vP3vEl-sjp{hX zAS6~}?Iuz#9U4aJA3?4B!Pi8QrlC}l1}B98X@1}M>*e;7Ge=R|QOUSGpwY%VkMcb- zWk!FCA1%rncWtvr<3AUJIYnkSPpDDSSFL0TZ?Im#Y5_}l9|YV63>$9XOxru&stJu2 z*r0U8aU}!qKX>9G)`_cH;FR8ChaxcDa{T@52ispmUB*y~d0DQUVjSo(1~f0v<u oQXj%C_u(eu<)kC=Tm2P`5n;~2(dxh}+*xYxuO4yUDsUW9}JD>z|dLgH+%2_~WugDa_w3=WJ84jmlT zsRIK!ICNn2mpC){5u&TZIm7!t?~||9zUT@$00sbA;bW0lbi!Fe=sGOEaW>(l#^DK@ z5_wGM7=OMzT5Ni8;fh(R!j$$YvHzh?H2Rn8@pp z%?X|I<=JLo(U{N`SLPvGV~VnnMMRD`i~k(Wb_r3OMp&ciw}68y026N}-e@7JuOlj+ z661O=^(pM{=5rb0y_qLif8&GhV=s6RhyMMbciR_@vL<`}P%L&jm*-+&R7~47)v7Cr zTh7($fmR88$D_E-6##DRUcWrpNId^;fSCYbW0%eVY3``tySlD9PQ6xjHCr`pUDF)T Z(~q5+;rotV%@Rl#w&=fX8X$#g_yOL*dQ|`b literal 795 zcmd5)yH3O~5bX06D^XmPC?o;yQlpcQ(20f$QTQ=AS?Acsb^`o8c_BrDtGEIe_G&$| z-kJ3k?Ug}#^lUgJ^?8z}X~MKVScy<4L@Ax{IR@i8DI@DSocCZmFR)h{Pu})QVga(? zAmR$DOoVTk_y!0&BtBM%&1Rt*)?!5@YKPvk@UEID;lhM!lsUpXKUAHe5LH!jzS|a} zWce+t%92Z2-SO=Wz*#Y|0^T|pfkW4F_<@*DX^AF0+{3}hXJ<`KFI3R$bfv-~D=ZyF z-;D|`WlHNbTA0Y9vSxab=wCQre%K}qSiuPs6B1{oca1oR0fH+z85tZH85}w| zs#6CBayWEg^e=H{@QBgb;l1Je{d~Xg)#?{bEd@XTU`up literal 594 zcmd6jy>7!G6oq#`#g#f_!XlBSV$W5iEK!$CQ3nEt6vYM#IBnm){;TArojQ~OuHZZ8 zUd{vUtpmG8IUJhqykLwKvTcuEBQ*sPqZ>ZQVq7=tbTgOpo_rq__O``y^mnVVfHDQB zyh5$Zh(@Y!K>6X~V?}H>i`2;uD_?}+ d%A^Y|I=C#e^=|4&^gn{x{uIow$&_VTd;viIpt1k} diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml-fine/main.swiftdeps index a9561fcf725d2213836793d0f20ab5230647d057..db076f86e69f651c79d76b99391c6b075cd8bd03 100644 GIT binary patch literal 408 zcmaiuJ5Rz;7>2(dxh}+*xYxuO4yUDsUW9}JD>z|dLgH+%2_~WugDa_w3=WJ84jmlT zsRIK!ICNn2mpC){5u&TZIm7!t?~||9zUT@$00sbA;bW0lbi!Fe=sGOEaW>(l#^DK@ z5_wGM7=OMzT5Ni8;fh(R!j$$YvHzh?H2Rn8@pp z%?X|I<=JLo(U{N`SLPvGV~VnnMMRD`i~k(Wb_r3OMp&ciw}68y026N}-e@7JuOlj+ z661O=^(pM{=5rb0y_qLif8&GhV=s6RhyMMbciR_@vL<`}P%L&jm*-+&R7~47)v7Cr zTh7($fmR88$D_E-6##DRUcWrpNId^;fSCYbW0%eVY3``tySlD9PQ6xjHCr`pUDF)T Z(~q5+;rotV%@Rl#w&=fX8X$#g_yOL*dQ|`b literal 795 zcmd5)yH3O~5bX06D^XmPC?o;yQlpcQ(20f$QTQ=AS?Acsb^`o8c_BrDtGEIe_G&$| z-kJ3k?Ug}#^lUgJ^?8z}X~MKVScy<4L@Ax{IR@i8DI@DSocCZmFR)h{Pu})QVga(? zAmR$DOoVTk_y!0&BtBM%&1Rt*)?!5@YKPvk@UEID;lhM!lsUpXKUAHe5LH!jzS|a} zWce+t%92Z2-SO=Wz*#Y|0^T|pfkW4F_<@*DX^AF0+{3}hXJ<`KFI3R$bfv-~D=ZyF z-;D|`WlHNbTA0Y9vSxab=wCQre%K}qSiuPs6B1{oca1oR0fH+z85tZH85}w| zs#6CBayWEg^e=H{@QBgb;l1Je{d~Xg)#?{bEd@XTU`up literal 594 zcmd6jy>7!G6oq#`#g#f_!XlBSV$W5iEK!$CQ3nEt6vYM#IBnm){;TArojQ~OuHZZ8 zUd{vUtpmG8IUJhqykLwKvTcuEBQ*sPqZ>ZQVq7=tbTgOpo_rq__O``y^mnVVfHDQB zyh5$Zh(@Y!K>6X~V?}H>i`2;uD_?}+ d%A^Y|I=C#e^=|4&^gn{x{uIow$&_VTd;viIpt1k} diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash-fine/does-change.swiftdeps b/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash-fine/does-change.swiftdeps index c3f3e8151be883147b2f35c4650de0f0918294e3..c40809bb79d8266e4484b8af022a45baa7906730 100644 GIT binary patch literal 476 zcmYk0ze~eF9K~P0{gJwei0%G~J z>%2!+hge7b@@3&o^7p{(+A6|A;yszYwOJ&ycY)a~p|J%2i_l56KE8AN*|;H!~`#s-ePa=@($`7}!=flj}!D z?%rp{1{KbxPl|8Y8v0UYJSzrFL|QkGSyAZ0&YXJtm>&#KM{+q@s=wtT4SaG>pxogQD>~vz)rm_ zPDHa@Ym26HesFyuls^S*oj08JKR1yC6=N|}gx6@QjGlz9Lnr7d=y4<_zwsYW0P!dW bpW>in4ZijP^r1yK0(_)_Jzs?bcALv0&z!Tp@k z#wTwh7Fa0LE@APbLYd>dDi>({>$C}BSlH;Ez7{oA+p&!F2h9SH)GHyE_ z+kJ{NRh{=-)hM;V5~ZV#E7`0F@b@LT4VC1iDmbNQxJJ=oopUQZG&z4++YfQ1mjyY| z#Q@D+h~}~|#~;weZdV2&j_Y5z?*AZE ZJa2TM!H@nOStb;9d%4EPaV1F-eFIyd3^xD( diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash-fine/does-not-change.swiftdeps b/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash-fine/does-not-change.swiftdeps index 5dc734cb0e00071b37831a90b4f24165fef24d9b..d62a86322d3a5ac0afc532469138a45fbcfe5b80 100644 GIT binary patch literal 472 zcmYk0u}dRS5XQe9lWc56-J3PJ=y5lh$Xi$*jF*~R0!WlfpF zBBh1J7M5z2!eV(^q_Ff45$hDbH7Zxk49xHQzL~Z4?Hw%(Z~(e?9}jKTlYB^Q6y|Ov z@5%hiuT|bBt4pk_x_q2}mi#3&d$y9Wh|rR2#nNIH$Y++G4CbO!&0=`?Tfw|Iu^?RGA=n&Y93N&{NO}x(+>y^wb!A hur!d0ClF8ybf6*7UV&?9G4_D~Iba(L_}>HdWFBJBa{Hp(Ro|lD$*8!o+^^+%eR)PRO~B z8EyOqO_uff^^C=j5@m*qvRI<=ll?l(Ft@Wu)F|1DRx*WGn8YxSVGzSGh7r8gGHzQU z+y0C*Wwq|P>QQKc1xiO9SF+v_;4g}D8!F04b#O}0af6}-JLhqDsMq{u?jXd`zbwd! zJ_cy+LNu3!IsTH;-L4En9M|nifaX3#bFHq-yrI53&be>CR6K8WpfipR1?tkw}J0t?@`>!6qI}iI#fBgy>7b zri6~={AAVeXhP^h8dJfRs3J_TnCP)&$seQMEMgR^G1^G_HDLDwz`~yiAIwzqWkA(q z;#_U7e<(X!x$K7WR?iW%zi^=a(24HVet6gG+;ml^Wa~WatA$qU{8Wvcvg-$~X$6}4 zlMC!>WS67xl2hzv^8nX=r(5c+AUwS70c19S)YnWnJSe-4$+>IWerN@}Qstp#1(gbF OJ`bvy{Qq)z2EGBmzj>1Y literal 592 zcmd6jKTpFj5XJX=ijx>RIZ9I~Y38aDOU2R&F&N)VWi_#l?UeHEasD7>fr$YR_UZh4 z=jV4v2W=qEUZ#WTT4X|qOt$UOGD4jZ3A*5OD28>>hU=-E_F#LjaL_HDy}fG249ei3 z;sVts!Z%WV1InhxZ9%M7v((5A3n5XLyyf9TH<97ONHyA=;hj%YC-m`ty?rQ{x0{Vb zskquP%2HKT>Pc3+Q5Eps!zdj4?hQT(i?PjU!qXlOhEL9#nqKI2ywG9(RG9rl-w*!( dDw58%=wPCZ+M4l2qJNRg`lnoe4JOa?>ePXO91a~A{Y#t~JYsZqcyIWAKi}_r)!Jo4Ndr&-*jC=>iA%%ybL`HIp#qm1G8g)kt0Sa73q2N8D&^`Ui8!6QBtdH8=3=C+ zIGrIf5sUM6!X+^xOQFv=T}f4zaT*~l5;XqnsMK;2mC;Drvgy}=!)pLj{*3(L92+k~ zg3pkByTAFN9PDM%TgqD{gQWc>2O1CUu#X2px7Y66VLNYWelWnRBP@C}72cX0p! literal 594 zcmd6jKTpFj5XJX=ijx>RC5lr*n#`zDmx_f6F}U_~v6|Sf?G*U-BSIKHdG^ z+4t^fuMN_(=ffrGmM3YNCcJHrRw6VBQA!tlj>&i~+Q?>3=NN471@^kdleaf5v4A`{ zh`2(viSUYxZ$Q|g@UbE`n?-7Phn0}X#y9vZylWLDT$nJW%^BYLVeHI;75A*J*p^j! zURJ!W*-7kn+oC8{`Jlw43b^(#0>{2P!4JZGDodzvc!YzI&(4~LUg&jd=&)=RmJdbW gj|=>jC!K52!9*UlHPeek|HByelQF+KlVw@*1+Vv?6aWAK diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-depends-after-fine/main.swiftdeps index 9183a8ba33282953213470ea05e0ce6f04649ac5..0fbef28af95e2d036619182ac932f5f99771546a 100644 GIT binary patch literal 392 zcma)$zfZzI6vtmrL0E_}aj%In9M{sL{IE?Ju!0jNCM3>6@0wsD8X>rnlaaxJk-?#Z zqdIk9AcsQ-M*k9L29Fq>9o`$h-_Q5^UcGVA(oz5f0Cu$ZMeN~;Br(Ekk$sh9B6HQl z6Ea2S7~!$na(T3p9LDouDWrBpr3?+&FI%vRKq3jKwnc%J3e54D>jac`Y+B;3L#gXJ R+z*_ReasV?|8eRJd;_f2c#!}A literal 593 zcmd6jJ8#1v6oq&HiYs-zFOzUQx>X&lalOLnR(F}Nw{%#ajP^18v zH>hzLQ49G4NM9~KH^gqYN}aIS2#IW&txg|CXN8bvN*i}Y46(Q_sA~4Am8xqs=a&O- z(6yX*T??t(=J2?5O?V&SB+jF~AQmB?%@lMxJt4rUm*8DbuS9S2i%ILR(mGI%<7D+$ anbz|dV&W|Qia3Y?f-9+v3=WJ84jmlT zsRKjvaOlA3U*gQ*BScq+`)+d1@0|OZt;;JR4?qDRCw#<-MW&1fAWbcfkPzvNDbE&(nKBQg2}&ghA4-OMt>cRR*9oL8giRA{Tgt117Pw$qdSg8^>s|d zGpyb1r$2>*-9kPqyf+HS?QcGC_1N`?;>ha{y1jd`R@P+K8;Qks`}#ukYZas87;4p# z#4YD&rmt0e&vpsV=Jx=~N^f}U^~-}zkLx`QHo5@N;X9KBY@}4MJ>S+eU#}XbV|H9e iHFVup4b|6;6VF$T971Mii~h@I0Mc;^#+U{a`Hdf^OMChN literal 1010 zcmd6lO-sZu5Qgvl6#)-DwZ^towr5!oWbxujJfz8+HEf&2B(3`I?UzuHdf64sAsHs` z%;cHL71=9|)&A|xxDk3ByCwz{^xK2uoYBuNHo6d3URf9)odL^(3 znYZ9!B~?1WNyfhg+zgJ7l_HLpP|aGb0tt!JYZG4KQva@G5U_rhN~Mo*)(xp=eGOUX zxh%4B$9GI{S{6l3ODc=<7Lt}z0gty1n&Z&5HQW$LC%1s~_jj<+;>j9ak!O;Tm+4CR zh0QO|3a%S5F4dXVHfW&(3(DxJA|d~$JvUqJIjcLt*a!4z7TimI7dGYmG3IQGgZ?eZ RnbX~%$+u{Jg-O#i`T}%P38?@8 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-depends-before-fine/main.swiftdeps index b21ca1bfe8e11b02a36e870fab3fe2dce24bc591..e64b80c08a11666407962925adc27e9522d94065 100644 GIT binary patch literal 408 zcmaiuzfZzI6vtmrew4)!6Ze`J!*MMwl-80kU|)%cB)1Ure320>Kd?Q?5U|c)|43^KGNz ztIC%1&01)dL)s0n=*oG3l78d$`lZ1}6VSVXECF~TOJ@Kzb_}o`@3`uFwrM(5$D!ETQbG+sXIXX5Rg8D2ws{JTQL+U3nBQOD3Di&4CPeces`=xU^S|n7nDU6y HG>yIhy&lwu diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before-fine/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-depends-before-fine/other.swiftdeps index b0a83b5a9b5beaa0f5ebf0158e912ed39009452e..c49bc07e3e6eb0f49eba50005acfd0fca1a2e08a 100644 GIT binary patch literal 420 zcmaiuy-&hW6vb~Z--}Tb_nH{Pz|dV&W|Qia3Y?f-9+v3=WJ84jmlT zsRKjvaOlA3U*gQ*BScq+`)+d1@0|OZt;;JR4?qDRCw#<-MW&1fAWbcfkPzvNDbE&(nKBQg2}&ghA4-OMt>cRR*9oL8giRA{Tgt117Pw$qdSg8^>s|d zGpyb1r$2>*-9kPqyf+HS?QcGC_1N`?;>ha{y1jd`R@P+K8;Qks`}#ukYZas87;4p# z#4YD&rmt0e&vpsV=Jx=~N^f}U^~-}zkLx`QHo5@N;X9KBY@}4MJ>S+eU#}XbV|H9e iHFVup4b|6;6VF$T971Mii~h@I0Mc;^#+U{a`Hdf^OMChN literal 1010 zcmd6lO-sZu5Qgvl6#)-DwZ^towr5!oWbxujJfz8+HEf&2B(3`I?UzuHdf64sAsHs` z%;cHL71=9|)&A|xxDk3ByCwz{^xK2uoYBuNHo6d3URf9)odL^(3 znYZ9!B~?1WNyfhg+zgJ7l_HLpP|aGb0tt!JYZG4KQva@G5U_rhN~Mo*)(xp=eGOUX zxh%4B$9GI{S{6l3ODc=<7Lt}z0gty1n&Z&5HQW$LC%1s~_jj<+;>j9ak!O;Tm+4CR zh0QO|3a%S5F4dXVHfW&(3(DxJA|d~$JvUqJIjcLt*a!4z7TimI7dGYmG3IQGgZ?eZ RnbX~%$+u{Jg-O#i`T}%P38?@8 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-provides-after-fine/main.swiftdeps index 2f22faafc626f27f1bd7bda77f888e669ef8be68..dad97a138822e81bb9a521b469d19e6429107c65 100644 GIT binary patch literal 408 zcmaiuzfZzI7>2)|{9K4Jaj%In9M{s8+NucyR&c_^gv8m>_7Y4)BLr7c85tZH85}w| zs#6CBayWEg^e=H{@FPT5hr8i@pZCdEZ(O#d8~_7=tn@KY96A;(A#@cM-vk?rQg#27 zO^7-obcDZH94rO<3YD>g2#pAv2<_RSbD>Q`Wki%0p~Zq>QmsGHC}dNICPYb`QcToU z$Yz92#NvFtaA-{EQfRY~tuRGd$ReUfg2jK1TBC$0P9v<*^jpB*HGqvb6Ms0D_17Vl z&xm!illqi)xAVD-^j^yotiSO=>#@W8@*sHVb?&;dRW?;W7|6wD^Xfw8mSMY|tyern z-f*6I!cBt*ZJ**cR{*$mJKb_`E%Af<9%d4Ni(NVcq_(94uNXEzwDii6YjW3abJI6$ Y&uHtG?;oQmOCVj?p#QRIfE23X2h>q|R{#J2 literal 795 zcmd5)!Ait15WV*+20ZMkrR}<_^ehX4EM7c`hctOv!lp?~(yD)Nn^q`@2XPPPkPMUe zX6C)*iVn&kKY2DDf`&57^E_i(AFV)WGNPQ$_?Uueos|*I9L{^Nz2`V6jYn?>C9nWl zaNuzTRVKnq#=ijEj*0gbVzXJOhILpGiMnyNBD^UX1zbodsmux9`LXH@m36h3*SoU5 zVOz=et=x)g&#SiF32`gYCRV^}55sZnyB2;VmMJYD!~Go`jCgX^H1te0y`(D@7Fl7L zDEfXre%K}qSiuPs6B1{oca1oR0fH+z85tZH85}w| zs#6CBayWEg^e=H{@QBgb;l1Je{d~Xg)#?{bEd@XTU`up literal 596 zcmd6jy>7!G6oq%5;z}JdVUfsEvF9pMm#9mpssn*Tiedu=oVIUY|5fr_btnT|!FSHR zoI5%?4}M8%JPh3g+qDq%^9qq$`QJ3 zQ0EJhRr&|eVZ8X<5WC$f^{U54NEFH&Qk6fPEe0{qn05Yw6w_$Cu%_M{sZArT5a)xa z(MTbhMnYRzAMTg78SewU#%bu!NTX29W(GDtJ|M!I=NNoTFGR2Ni_7b`@;XsT!({bW aq4cps4_{Pq!OtCu{zo$VUnNsj6=UC3ETG%~ diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-provides-before-fine/main.swiftdeps index 2f22faafc626f27f1bd7bda77f888e669ef8be68..dad97a138822e81bb9a521b469d19e6429107c65 100644 GIT binary patch literal 408 zcmaiuzfZzI7>2)|{9K4Jaj%In9M{s8+NucyR&c_^gv8m>_7Y4)BLr7c85tZH85}w| zs#6CBayWEg^e=H{@FPT5hr8i@pZCdEZ(O#d8~_7=tn@KY96A;(A#@cM-vk?rQg#27 zO^7-obcDZH94rO<3YD>g2#pAv2<_RSbD>Q`Wki%0p~Zq>QmsGHC}dNICPYb`QcToU z$Yz92#NvFtaA-{EQfRY~tuRGd$ReUfg2jK1TBC$0P9v<*^jpB*HGqvb6Ms0D_17Vl z&xm!illqi)xAVD-^j^yotiSO=>#@W8@*sHVb?&;dRW?;W7|6wD^Xfw8mSMY|tyern z-f*6I!cBt*ZJ**cR{*$mJKb_`E%Af<9%d4Ni(NVcq_(94uNXEzwDii6YjW3abJI6$ Y&uHtG?;oQmOCVj?p#QRIfE23X2h>q|R{#J2 literal 795 zcmd5)!Ait15WV*+20ZMkrR}<_^ehX4EM7c`hctOv!lp?~(yD)Nn^q`@2XPPPkPMUe zX6C)*iVn&kKY2DDf`&57^E_i(AFV)WGNPQ$_?Uueos|*I9L{^Nz2`V6jYn?>C9nWl zaNuzTRVKnq#=ijEj*0gbVzXJOhILpGiMnyNBD^UX1zbodsmux9`LXH@m36h3*SoU5 zVOz=et=x)g&#SiF32`gYCRV^}55sZnyB2;VmMJYD!~Go`jCgX^H1te0y`(D@7Fl7L zDEfXD6r@PvfK^CLFfqY6TiREHF=~MLv60Hi;K0b> z(7{oi7#PUYfx*$g#F@cMh{ny~-r=0{JNNFD4{M4FzyTnlypAUp>q$OAHudArlJ{g{ zdwqxZG1*1dr7hn!J|zG2^`1o$79j7-^n=C5GClD1F6xgmJ(Qf3?Y(;z_(OGrFCz zmU-$hZ5Q)rE1`E~H5OGDm6uW!$^N2&+D*f2YuBRLYFu7u`BX0Hifb)itsWm}UfwWm z$IN6MU7P2eT+z!Jo~XNwSak{DHr1LnxZssdoo^cdYgzqH%cMq4!P^P{^fp{@Yz zU$n)kX#P0Z;6Eysnmg-K=vbGCQj^66un;CsJ2&T;*yPSQqXiH zhM4E;=~GcmST4rM$Al9xW_*oxm#5E)G^15juF1v5K|Re$_{B3>()`UDJ%e``^`Yp) z5I$;w^evfhe=4}@2yrW4N~@?O9WY3v>n{TQzd3oAIaj$7j9t=>REv4bL(;LyMHk25 zz93ibY6s0@7tMWPE|2b984ODqqmSzKV4Lv&O5*UZSOS$lpTRqxwnelg-a%){MwgLg HS(bbQAVYY4 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps-fine/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps-fine/main.swiftdeps index f5b2d6b0dd35ceff4cd5eecd5498947bae8cfb3c..4553fd0ac029f08b172bf14cdf3f11e983cfee31 100644 GIT binary patch literal 392 zcma)$zfZzY5XY}iL0E_}aj%InJYGwG*{TTxR&c_^gv8m>_9d8z#u{8nWn^$*WN_%< zs7@Ui$itxnqkoArgGY?c4tK-%$LFrmJa0<{00saX()%oP=}54Q&}CeH6>KCbwcTSj zChCyTA#O3>TL|_UD*j%HanI>+D=-}2=;(G3 N93miB`d<#uz&FfidDj2{ literal 592 zcmd6jy-ve06ovOZ#g!O3IZ9d@P-aw#rDExX7##b!vKs$jJ1x9Di4&wOFfri4zPkR- z_3^o*gSKGjz{f+z|dLgFm6eGvySl;BD#BZC7YgF^>L zb?U%C9u6HC{Y#t~JYsZqxEsDdK6lmHWkbpVFaX$)-e;*xM}nnrijx>RB}!TvP-aw#rD9=1436))wVK$*b_)D^5+_JmU}C_-`E>Wa zv+v!|K^x>JFUE`MT4s5kXQJzlmJynaD5ncPr(`-8ZMd1!IR-m;iG%L&+yH=6mLc)|bCwS+_u`{c-RjqFK<@QeO zl&D*^qDO0CK61I5F{*k_6#(P<*3gN=xay2VwNH# zt^=|_ct)4!8;6M_gjZBr1Z2&oEG!@)5<^O&zl=t^#874pnaq-Y1t?qr80==`j$>Ya z9b^6sY1aokpQ)q$JeN(qH}Z(d->jhf*!Lg!k#|4r-wt@KtctET;)|V5?}GO=MYkMX zt~dg}{1HEi3j lRBIKbrW%T+8;++KhHc~!WcIe`zig%e5T{`r90Krc{|~gzds_ei literal 1006 zcmc&y%WA_g5WM><1U=+r<5v>lTcHGc3B9zJ(t|9mgNU_KB{^;XzJ91+2rhl3R0nBU z&8&7-b47L%AwF2vAA+3HD30TZwe4ODa8*P|Opfq21j9N?6x9??yVITJu#+v^S$&cM z0+2Za+|QsAJ=liv4*=JF;&p~ttpXL9f*FyJ>%_gt#tSfRgftQlV2$ldPPk3FuIaig z1g+~PFSmKNEojCzltV^oO-Gi4=MIp=zEd^Wo|ukl0gb!80Rt%RjmC;RlAJt^SJDMd zF0|uqH?)7Li73;80`$yFjpK`i{Qp?8rLp{KDyWr2)&`Z|cSosugJ$d@6gcxpaL?H% Z=SynRKb7;Pul=c}VoB4dl9D8e-T?gahLo^Px%P+ypG*wAMAFho zg($uD$qeB!U7T+m1`ZKk(d^78Yqn)!J_%4dpd|dssMJ#oW!8YnEa_W-L>s_hHzQ{- z7v<*x7SE7+br^l;jt}C(4)~VT^IXfp%q#2ySef1?!EtYUAh5qGT$`P4&T9S6=AYSZ@jHMj5gD|S ztJ|_(l1;0aR}{yy99>hLl3h^Lf}AhL5X5-k_qR0s&qskz0L&vW@Q(o6)jfcz$PQxl E1r`H>{Qv*} literal 1424 zcmc(eyK2KQ6oz*{#eoi4YUB8l*q%$EOX$)rrGqRT2NCO1$xhq1uP-VXLP(t^RD&d> z|491I`E>^yF45l^(hUp_q38R)N9ua37}~-E@L`W%{iJVuE?F^7$KI;eP~7kupNu+i zhE7PVM%qlITsCMbLVpBQbqk*p#bV(?B@s9Y1SkXh!K;R$wu7YNa)(Bn?#NNM$}p#4 zo`s}bM{&%mlI5$EWi*M?B#hQWl*RWJCBl#_YlF` zu*FJ$Kcz(~!6m63=6r`FqBH5Td~pXH z`NTQssL;_VobaYNzpCw}Oz|nEnx#Ds*I{!B0tjTl@>Wn^$*WN_%< zs7?$F&BK9#(Z9r*!AFQXI^5-Q-_Q4(%hl?aO^yd30FdO~qlJk_lq?Wl1({b$Ml@SK zs**91h6oQ?r}N__C7*#fG8uwHM8;HpGI2!ZNgxi9_)O&~C2Ui!J>oDR6B93xxG=L* zB&`B6LwHQ*=WBJ)*57Qm5?g>OF$D}yQ*B3a w4ZmcouC3}NwP1Kf-E&S#mR7QoaY!Oa>~3iImrtYtq8JQ<1AumQhg}5l4Fht3dH?_b literal 1216 zcmc(eJx{|h5Qg{s3QG)KNR%dNLo%aEEENkZh{3VXl~sRXI|cqd`7lzXDuMtN9_*9- z-r3LH`3mj0g7{!@w@`FSqd1NuEW}<@aCL-GjE?Z$8~r$PMeETVXQx|BV8;dATYcgb zf)G0c#80GLd9VzVPXW>0#@j@(S_M~yB}^O{y6Uwepfu4s` z?gEwzFY>nS3H~Z6(g={CJoa3x;l>X4-!rqG%gnE`qO{}+i$J-&K?>RR=$br+0B3Cy q8tAOf*&I!JQJim;_NPqw9MeUSzWTx=O|!T{#ZnrEg@Y(blIR0oU_I^t diff --git a/test/Driver/PrivateDependencies/Inputs/private-after-fine/d.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after-fine/d.swiftdeps index 93de7a407514b9bf290fe7b55739e645ee530b6c..7866ec7f6385b8d920c87a19518fa72d0c47ab0c 100644 GIT binary patch literal 408 zcmaiwzfZzI9L2AvK#7SlChjFMhT~dVC~a-RfEAoDF(GlbKNCzuBL-J;GBP+YGB|W_ zRHqIM;pLvqR=woicfZP-(4}2U2U$7=5$U8#cG~{?`a=an=nz_{2I)Ax zce;CecW_XI>B+O<5OB$pG))tx_0b9pO#+a@89&EhTxUh1nZtPxw)Y$lO5>xq7bP$P zS#Zd^1yoUoUNZg-;C4uSED)MJM#m4<%<@joY&2xu|8; zmZB|pRaw-y*&)BL*tTL5E8ts?#PQgh7X3iXr?fyB9`@*v#FMkszzY=cI$fy{X9}^M z&i7;cf2D|V8Vyp%I%R2k5#ax2S^p%a#=UT%AVp2+J>AO*jRm-h3i)M5hi(v79=k z1S_kE&M=wq#o0RHkOY$@S7#AjfeK|2jj~FZJ^Vkg^qyf9{cW--=QP!1!4WwebeR(d0M#Xe} zQ>*&2wBdZ+4)sdNynsMf+(C$y`|E~)-Sv?Oe^tA2yS++qnaLvD*wT>A4Bhj!zz!`> f4?Nwp^s3EjCi9Oi*Rb3iMw#6W`Y)R)z)(0pH9C6} literal 795 zcmc&yJ!``-6x{tQ1RXNjICc`(oY5VW%4;2idLujEIq{q|U z(|f18BL``ao;)26PA++prfEWzI$Dm!jwq?t5UW=+N zd0XzPvZ%4yf!$YhThWOX@YcgH9DCiu55#;*bBOS;hlAly&YFh2kb=BUS2DzzLTsn= z{n-9rDWaW%hUsW0t(jgVnf65Vt4$;GYH L2&w{-EX$HFGr-cf diff --git a/test/Driver/PrivateDependencies/Inputs/private-after-fine/f.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after-fine/f.swiftdeps index 993aae48b3a01fa996bdc97a56af898ba57dbd8d..24bed2a42a7facf0b13e4fa364b53fb46d084896 100644 GIT binary patch literal 436 zcmaiwu}{K46vkf1b6M*k9L29FSR^djii%Z4BV5CDh^??GtcF(VmJy|$lxv3|Qko?SYGe-EPRDHz0N2V4IksMm- z8Op3YGDmpA7Uye+g=YvaS#Iu;72onOkN7C#Gcx)T-fjNPv>Dq1RE{WMQcdmH wietJ)M|C=?Zm0#57IkW$7;VjH#}UMKH|YOt6kk literal 1214 zcmc(eJx{|h5Qg{sijx>RB}$XDp_x%7mWl-y#NgPkE31he?4-cICm%+tR8>$)g$LU@ zzh~cbcfO&u(g?Sf^^2f=9E4#Qu&UY^0apY>A?@%nY=*H@S`^cEnw{w^$68f*ux76W zypXvDygiUA-NH)7zXaU$hW7)-Z021xt8w5+BqR5xWGm3PQ6iPz!ZxIUBtkUOQ-xO;?w&y<0()rsQQjQO+Yd zA5Ck!A^N{cNZnMZp*Lm7_}|2LyjPcxKRJtniH9|4kWfKzrevPOX* zzl^YOhSaP5=m&SWm*BU!w@Lyr`HK}aA9~KcFtqOmy_>$EW|fR(4~0~t(Yg>EHCODI zMLBPZ!iF=IlB47t+psY6^4kF2>|mW>*|!7W*{=%MonAlJZT-zoE4Brw5|N=~tBPUD xR>{!}#WIwlrsPX@p=g^YT1VA7@hHR*#CA6{{L9CZ06_#s?g2o%y2CC4_y!45fQA47 literal 1216 zcmc(eJx{|h5Qg{sijx?+kSI;khGa&SSSl7+5QAf%BddvRY^T7#Cm%+NR7Fsr!h?OX z-#h!cJ72+0NDOO3`h~$U4#F@DNYm^ULt6#_Asq01Fotmul9iJ=%~o}W;!ZSpZ`4sR z^g?1aQa6(d>CkXOKLu3v8*ekkYUN!eX>sNVP)GJvaK}*FQNo3+(P-0$oOA_l(u&5c z;CYp@D&6L3Qed`4dXtk)PDU?_FC9vX`>w6f^p5ek&5+x>Thu7ogI2PHCrGX#gXi&7 zSdV4>i=62Og1<^is~c=lI^u+qih>V`v_1j= diff --git a/test/Driver/PrivateDependencies/Inputs/update-dependencies-bad.py b/test/Driver/PrivateDependencies/Inputs/update-dependencies-bad.py index 97585bd4779bf..dd5463259410f 100755 --- a/test/Driver/PrivateDependencies/Inputs/update-dependencies-bad.py +++ b/test/Driver/PrivateDependencies/Inputs/update-dependencies-bad.py @@ -22,9 +22,10 @@ import os import shutil import signal +import subprocess import sys -assert sys.argv[1] == '-frontend' +assert sys.argv[2] == '-frontend' primaryFile = sys.argv[sys.argv.index('-primary-file') + 1] @@ -36,7 +37,14 @@ try: depsFile = sys.argv[sys.argv.index( '-emit-reference-dependencies-path') + 1] - shutil.copyfile(primaryFile, depsFile) + + returncode = subprocess.call([sys.argv[1], "--from-yaml", + "--input-filename=" + primaryFile, + "--output-filename=" + depsFile]) + # If the input is not valid YAML, just copy it over verbatim; + # we're testing a case where we produced a corrupted output file. + if returncode != 0: + shutil.copyfile(primaryFile, depsFile) except ValueError: pass diff --git a/test/Driver/PrivateDependencies/Inputs/update-dependencies.py b/test/Driver/PrivateDependencies/Inputs/update-dependencies.py index 5f29e0541ce1d..c366439e01358 100755 --- a/test/Driver/PrivateDependencies/Inputs/update-dependencies.py +++ b/test/Driver/PrivateDependencies/Inputs/update-dependencies.py @@ -31,9 +31,10 @@ import os import shutil +import subprocess import sys -assert sys.argv[1] == '-frontend' +assert sys.argv[2] == '-frontend' # NB: The bitcode options automatically specify a -primary-file, even in cases # where we do not wish to use a dependencies file in the test. @@ -43,8 +44,13 @@ depsFile = sys.argv[sys.argv.index( '-emit-reference-dependencies-path') + 1] - # Replace the dependencies file with the input file. - shutil.copyfile(primaryFile, depsFile) + returncode = subprocess.call([sys.argv[1], "--from-yaml", + "--input-filename=" + primaryFile, + "--output-filename=" + depsFile]) + if returncode != 0: + # If the input is not valid YAML, just copy it over verbatim; + # we're testing a case where we produced a corrupted output file. + shutil.copyfile(primaryFile, depsFile) else: primaryFile = None diff --git a/test/Driver/PrivateDependencies/chained-additional-kinds-fine.swift b/test/Driver/PrivateDependencies/chained-additional-kinds-fine.swift index 08a90d1620637..bf93187d4207a 100644 --- a/test/Driver/PrivateDependencies/chained-additional-kinds-fine.swift +++ b/test/Driver/PrivateDependencies/chained-additional-kinds-fine.swift @@ -4,23 +4,23 @@ // RUN: cp -r %S/Inputs/chained-additional-kinds-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled yet-another.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s diff --git a/test/Driver/PrivateDependencies/chained-after-fine.swift b/test/Driver/PrivateDependencies/chained-after-fine.swift index b3d0718b7908b..6bbfaff140f18 100644 --- a/test/Driver/PrivateDependencies/chained-after-fine.swift +++ b/test/Driver/PrivateDependencies/chained-after-fine.swift @@ -6,17 +6,17 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift diff --git a/test/Driver/PrivateDependencies/chained-fine.swift b/test/Driver/PrivateDependencies/chained-fine.swift index 48e95a4f3bf4c..08f75db2d475f 100644 --- a/test/Driver/PrivateDependencies/chained-fine.swift +++ b/test/Driver/PrivateDependencies/chained-fine.swift @@ -4,29 +4,29 @@ // RUN: cp -r %S/Inputs/chained-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled yet-another.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240009 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./yet-another.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s diff --git a/test/Driver/PrivateDependencies/chained-private-after-fine.swift b/test/Driver/PrivateDependencies/chained-private-after-fine.swift index fda6851f03bfd..5e5a007abea23 100644 --- a/test/Driver/PrivateDependencies/chained-private-after-fine.swift +++ b/test/Driver/PrivateDependencies/chained-private-after-fine.swift @@ -6,17 +6,17 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-DAG: Handled other.swift // CHECK-SECOND-DAG: Handled main.swift diff --git a/test/Driver/PrivateDependencies/chained-private-after-multiple-fine.swift b/test/Driver/PrivateDependencies/chained-private-after-multiple-fine.swift index 9bcd64b9cc265..76fcb8f05b9e7 100644 --- a/test/Driver/PrivateDependencies/chained-private-after-multiple-fine.swift +++ b/test/Driver/PrivateDependencies/chained-private-after-multiple-fine.swift @@ -6,7 +6,7 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v @@ -14,13 +14,13 @@ // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after-multiple-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-DAG: Handled other.swift // CHECK-SECOND-DAG: Handled main.swift diff --git a/test/Driver/PrivateDependencies/chained-private-after-multiple-nominal-members-fine.swift b/test/Driver/PrivateDependencies/chained-private-after-multiple-nominal-members-fine.swift index 57664db3e39c1..78d02c537c540 100644 --- a/test/Driver/PrivateDependencies/chained-private-after-multiple-nominal-members-fine.swift +++ b/test/Driver/PrivateDependencies/chained-private-after-multiple-nominal-members-fine.swift @@ -6,17 +6,17 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/chained-private-after-multiple-nominal-members-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./yet-another.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-DAG: Handled other.swift // CHECK-SECOND-DAG: Handled main.swift diff --git a/test/Driver/PrivateDependencies/chained-private-fine.swift b/test/Driver/PrivateDependencies/chained-private-fine.swift index faa7a286871fc..f286de7ba7522 100644 --- a/test/Driver/PrivateDependencies/chained-private-fine.swift +++ b/test/Driver/PrivateDependencies/chained-private-fine.swift @@ -4,19 +4,19 @@ // RUN: cp -r %S/Inputs/chained-private-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Handled yet-another.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./yet-another.swift -module-name main -j1 -v >%t/outputToCheck 2>&1 // RUN: %FileCheck -check-prefix=CHECK-THIRD %s < %t/outputToCheck // Driver now schedules jobs in the order the inputs were given, but diff --git a/test/Driver/PrivateDependencies/check-interface-implementation-fine.swift b/test/Driver/PrivateDependencies/check-interface-implementation-fine.swift index cd0722ac7e532..4aa32c6d90f67 100644 --- a/test/Driver/PrivateDependencies/check-interface-implementation-fine.swift +++ b/test/Driver/PrivateDependencies/check-interface-implementation-fine.swift @@ -6,7 +6,7 @@ // RUN: cp -r %S/Inputs/check-interface-implementation-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./c.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./c.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning @@ -20,7 +20,7 @@ // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental > %t/a.txt 2>&1 +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental > %t/a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps @@ -33,7 +33,7 @@ // CHECK-RECORD-A-DAG: "./bad.swift": !private [ // CHECK-RECORD-A-DAG: "./c.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./c.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix CHECK-BC %s // CHECK-BC-NOT: Handled a.swift // CHECK-BC-DAG: Handled bad.swift diff --git a/test/Driver/PrivateDependencies/crash-added-fine.swift b/test/Driver/PrivateDependencies/crash-added-fine.swift index 0b47de5f57305..6c44728f6ad6a 100644 --- a/test/Driver/PrivateDependencies/crash-added-fine.swift +++ b/test/Driver/PrivateDependencies/crash-added-fine.swift @@ -4,13 +4,13 @@ // RUN: cp -r %S/Inputs/crash-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled main.swift // CHECK-INITIAL: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./crash.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps // CHECK-ADDED-NOT: Handled @@ -26,13 +26,13 @@ // RUN: cp -r %S/Inputs/crash-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIXED %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIXED %s // CHECK-FIXED-DAG: Handled crash.swift // CHECK-FIXED-DAG: Handled main.swift diff --git a/test/Driver/PrivateDependencies/crash-new-fine.swift b/test/Driver/PrivateDependencies/crash-new-fine.swift index e2cd57610f593..1d07151753e9a 100644 --- a/test/Driver/PrivateDependencies/crash-new-fine.swift +++ b/test/Driver/PrivateDependencies/crash-new-fine.swift @@ -6,7 +6,7 @@ // Initially compile all inputs, crash will fail. -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // CHECK-NOT: warning // CHECK: Handled main.swift // CHECK: Handled crash.swift @@ -15,7 +15,7 @@ // Put crash.swift first to assure it gets scheduled first. // The others get queued, but not dispatched because crash crashes. -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s // CHECK-BAD-ONLY-NOT: warning // CHECK-BAD-ONLY-NOT: Handled @@ -24,7 +24,7 @@ // Make crash succeed and all get compiled, exactly once. -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // CHECK-OKAY: Handled main.swift // CHECK-OKAY: Handled crash.swift // CHECK-OKAY: Handled other.swift @@ -34,12 +34,12 @@ // RUN: touch -t 201401240006 %t/crash.swift // RUN: rm %t/crash.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // And repair crash: // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s // CHECK-OKAY-2-DAG: Handled crash.swift // CHECK-OKAY-2-DAG: Handled other.swift @@ -51,7 +51,7 @@ // RUN: touch -t 201401240006 %t/main.swift // RUN: rm %t/main.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-MAIN-SWIFTDEPS %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-MAIN-SWIFTDEPS %s // CHECK-NO-MAIN-SWIFTDEPS-NOT: warning // CHECK-NO-MAIN-SWIFTDEPS: Handled main.swift @@ -62,7 +62,7 @@ // Touch all files earlier than last compiled date in the build record. // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 -driver-show-incremental | %FileCheck -check-prefix=CHECK-CURRENT-WITH-CRASH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 -driver-show-incremental | %FileCheck -check-prefix=CHECK-CURRENT-WITH-CRASH %s // CHECK-CURRENT-WITH-CRASH: Handled main.swift // CHECK-CURRENT-WITH-CRASH: Handled crash.swift @@ -73,4 +73,4 @@ // RUN: touch -t 201401240006 %t/other.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s diff --git a/test/Driver/PrivateDependencies/crash-simple-fine.swift b/test/Driver/PrivateDependencies/crash-simple-fine.swift index d3061b7f86411..c04b3d7c01676 100644 --- a/test/Driver/PrivateDependencies/crash-simple-fine.swift +++ b/test/Driver/PrivateDependencies/crash-simple-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/crash-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./crash.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -12,7 +12,7 @@ // CHECK-FIRST: Handled other.swift // RUN: touch -t 201401240006 %t/crash.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled crash.swift // CHECK-SECOND-NOT: Handled main.swift @@ -24,7 +24,7 @@ // CHECK-RECORD-DAG: "./main.swift": !private [ // CHECK-RECORD-DAG: "./other.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./crash.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled crash.swift diff --git a/test/Driver/PrivateDependencies/dependencies-preservation-fine.swift b/test/Driver/PrivateDependencies/dependencies-preservation-fine.swift index 2a365335f2c40..52bdac2a03606 100644 --- a/test/Driver/PrivateDependencies/dependencies-preservation-fine.swift +++ b/test/Driver/PrivateDependencies/dependencies-preservation-fine.swift @@ -6,7 +6,7 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json // RUN: %FileCheck -check-prefix CHECK-ORIGINAL %s < main~buildrecord.swiftdeps~ // CHECK-ORIGINAL: inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]} diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-arguments-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-arguments-fine.swift index 454e270ef3014..3316c39fbd2ef 100644 --- a/test/Driver/PrivateDependencies/driver-show-incremental-arguments-fine.swift +++ b/test/Driver/PrivateDependencies/driver-show-incremental-arguments-fine.swift @@ -14,11 +14,11 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-ARGS-MISMATCH %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-ARGS-MISMATCH %s // CHECK-ARGS-MISMATCH: Incremental compilation has been disabled{{.*}}different arguments // CHECK-ARGS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift} diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-conflicting-arguments-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-conflicting-arguments-fine.swift index 96dfb68034de2..aa30eb0bfd20c 100644 --- a/test/Driver/PrivateDependencies/driver-show-incremental-conflicting-arguments-fine.swift +++ b/test/Driver/PrivateDependencies/driver-show-incremental-conflicting-arguments-fine.swift @@ -14,19 +14,19 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO %s // CHECK-WMO: Incremental compilation has been disabled{{.*}}whole module optimization // CHECK-WMO-NOT: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-BITCODE %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-BITCODE %s // CHECK-BITCODE: Incremental compilation has been disabled{{.*}}LLVM IR bitcode // CHECK-BITCODE-NOT: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO-AND-BITCODE %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -whole-module-optimization -embed-bitcode -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-WMO-AND-BITCODE %s // CHECK-WMO-AND-BITCODE: Incremental compilation has been disabled{{.*}}whole module optimization // CHECK-WMO-AND-BITCODE-NOT: Incremental compilation has been disabled // CHECK-WMO-AND-BITCODE-NOT: Queuing (initial): {compile: main.o <= main.swift} diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-inputs-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-inputs-fine.swift index cdc301d4e608e..83c515d558766 100644 --- a/test/Driver/PrivateDependencies/driver-show-incremental-inputs-fine.swift +++ b/test/Driver/PrivateDependencies/driver-show-incremental-inputs-fine.swift @@ -14,11 +14,11 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been disabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INPUTS-MISMATCH %s // CHECK-INPUTS-MISMATCH: Incremental compilation has been disabled{{.*}}inputs // CHECK-INPUTS-MISMATCH: ./other.swift // CHECK-INPUTS-MISMATCH-NOT: Queuing (initial): {compile: main.o <= main.swift} diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-malformed-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-malformed-fine.swift index 508d9b6a70bce..063fb166b155c 100644 --- a/test/Driver/PrivateDependencies/driver-show-incremental-malformed-fine.swift +++ b/test/Driver/PrivateDependencies/driver-show-incremental-malformed-fine.swift @@ -13,24 +13,24 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been enabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} // RUN: rm %t/main~buildrecord.swiftdeps && touch %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s // RUN: echo 'foo' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MALFORMED %s // CHECK-MALFORMED: Incremental compilation has been disabled{{.*}}malformed build record file // CHECK-MALFORMED-NOT: Queuing (initial): {compile: main.o <= main.swift} // RUN: echo '{version, inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -g -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-MISSING-KEY %s // CHECK-MISSING-KEY: Incremental compilation has been disabled{{.*}}malformed build record file{{.*}}Malformed value for key // CHECK-MISSING-KEY-NOT: Queuing (initial): {compile: main.o <= main.swift} diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift index fbaa9edce8cc8..5449fb09c7746 100644 --- a/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift +++ b/test/Driver/PrivateDependencies/driver-show-incremental-mutual-fine.swift @@ -4,16 +4,16 @@ // RUN: cp -r %S/Inputs/mutual-with-swiftdeps-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Disabling incremental build: could not read build record -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Queuing // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v -driver-show-incremental 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Queuing (initial): {compile: other.o <= other.swift} // CHECK-THIRD: Queuing because of the initial set: {compile: main.o <= main.swift} // CHECK-THIRD-NEXT: interface of top-level name 'a' in other.swift -> interface of source file main.swiftdeps diff --git a/test/Driver/PrivateDependencies/driver-show-incremental-swift-version-fine.swift b/test/Driver/PrivateDependencies/driver-show-incremental-swift-version-fine.swift index 8ca6af2cea4c0..0d23556e76336 100644 --- a/test/Driver/PrivateDependencies/driver-show-incremental-swift-version-fine.swift +++ b/test/Driver/PrivateDependencies/driver-show-incremental-swift-version-fine.swift @@ -14,12 +14,12 @@ // RUN: %{python} %S/Inputs/touch.py 443865900 %t/* // RUN: echo '{version: "'$(%swiftc_driver_plain -version | head -n1)'", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-INCREMENTAL %s // CHECK-INCREMENTAL-NOT: Incremental compilation has been enabled // CHECK-INCREMENTAL: Queuing (initial): {compile: main.o <= main.swift} // RUN: echo '{version: "bogus", inputs: {"./main.swift": [443865900, 0], "./other.swift": [443865900, 0]}}' > %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -c ./main.swift ./other.swift -module-name main -incremental -enable-direct-intramodule-dependencies -v -driver-show-incremental -output-file-map %t/output.json | %FileCheck --check-prefix CHECK-VERSION-MISMATCH %s // CHECK-VERSION-MISMATCH: Incremental compilation has been disabled{{.*}}compiler version mismatch // CHECK-VERSION-MISMATCH: Compiling with: // CHECK-VERSION-MISMATCH: Previously compiled with: bogus diff --git a/test/Driver/PrivateDependencies/fail-added-fine.swift b/test/Driver/PrivateDependencies/fail-added-fine.swift index 1713e01d2791c..96fd48459944b 100644 --- a/test/Driver/PrivateDependencies/fail-added-fine.swift +++ b/test/Driver/PrivateDependencies/fail-added-fine.swift @@ -4,13 +4,13 @@ // RUN: cp -r %S/Inputs/fail-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled main.swift // CHECK-INITIAL: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps // CHECK-ADDED-NOT: Handled @@ -26,7 +26,7 @@ // RUN: cp -r %S/Inputs/fail-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-ADDED %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-ADDED %s < %t/main~buildrecord.swiftdeps diff --git a/test/Driver/PrivateDependencies/fail-chained-fine.swift b/test/Driver/PrivateDependencies/fail-chained-fine.swift index c18d9a3cfa478..bb3178849247e 100644 --- a/test/Driver/PrivateDependencies/fail-chained-fine.swift +++ b/test/Driver/PrivateDependencies/fail-chained-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/fail-chained-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning @@ -26,7 +26,7 @@ // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/a.txt 2>&1 +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./bad.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=NEGATIVE-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps @@ -47,7 +47,7 @@ // CHECK-RECORD-A-DAG: "./f.swift": [ // CHECK-RECORD-A-DAG: "./bad.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/a2.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/a2.txt // RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/a2.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps @@ -65,10 +65,10 @@ // RUN: cp -r %S/Inputs/fail-chained-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/b.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1 +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt // RUN: %FileCheck -check-prefix=NEGATIVE-B %s < %t/b.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-B %s < %t/main~buildrecord.swiftdeps @@ -89,7 +89,7 @@ // CHECK-RECORD-B-DAG: "./f.swift": [ // CHECK-RECORD-B-DAG: "./bad.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/b2.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-B2 %s < %t/b2.txt // RUN: %FileCheck -check-prefix=NEGATIVE-B2 %s < %t/b2.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps @@ -107,10 +107,10 @@ // RUN: cp -r %S/Inputs/fail-chained-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/bad.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/bad.txt 2>&1 +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift -module-name main -j1 -v > %t/bad.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-BAD %s < %t/bad.txt // RUN: %FileCheck -check-prefix=NEGATIVE-BAD %s < %t/bad.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-A %s < %t/main~buildrecord.swiftdeps @@ -123,7 +123,7 @@ // NEGATIVE-BAD-NOT: Handled e.swift // NEGATIVE-BAD-NOT: Handled f.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./bad.swift -module-name main -j1 -v > %t/bad2.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A2 %s < %t/bad2.txt // RUN: %FileCheck -check-prefix=NEGATIVE-A2 %s < %t/bad2.txt // RUN: %FileCheck -check-prefix=CHECK-RECORD-CLEAN %s < %t/main~buildrecord.swiftdeps diff --git a/test/Driver/PrivateDependencies/fail-interface-hash-fine.swift b/test/Driver/PrivateDependencies/fail-interface-hash-fine.swift index 30d4bf3a2dd39..53c52594063a2 100644 --- a/test/Driver/PrivateDependencies/fail-interface-hash-fine.swift +++ b/test/Driver/PrivateDependencies/fail-interface-hash-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/fail-interface-hash-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -16,7 +16,7 @@ // RUN: cp -r %S/Inputs/fail-interface-hash-fine/*.swiftdeps %t // RUN: touch -t 201401240006 %t/bad.swift %t/main.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-SECOND: Handled main.swift @@ -29,7 +29,7 @@ // CHECK-RECORD-DAG: "./depends-on-main.swift": !private [ // CHECK-RECORD-DAG: "./depends-on-bad.swift": [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled bad // CHECK-THIRD-DAG: Handled depends-on-bad diff --git a/test/Driver/PrivateDependencies/fail-new-fine.swift b/test/Driver/PrivateDependencies/fail-new-fine.swift index 2e693d89656da..b3c917f498628 100644 --- a/test/Driver/PrivateDependencies/fail-new-fine.swift +++ b/test/Driver/PrivateDependencies/fail-new-fine.swift @@ -4,20 +4,20 @@ // RUN: cp -r %S/Inputs/fail-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // CHECK-NOT: warning // CHECK: Handled main.swift // CHECK: Handled bad.swift // CHECK-NOT: Handled other.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BAD-ONLY %s // CHECK-BAD-ONLY-NOT: warning // CHECK-BAD-ONLY-NOT: Handled // CHECK-BAD-ONLY: Handled bad.swift // CHECK-BAD-ONLY-NOT: Handled -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // CHECK-OKAY: Handled main.swift // CHECK-OKAY: Handled bad.swift // CHECK-OKAY: Handled other.swift @@ -25,10 +25,10 @@ // RUN: touch -t 201401240006 %t/bad.swift // RUN: rm %t/bad.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY-2 %s // CHECK-OKAY-2-DAG: Handled bad.swift // CHECK-OKAY-2-DAG: Handled other.swift @@ -36,10 +36,10 @@ // RUN: touch -t 201401240006 %t/main.swift // RUN: rm %t/main.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-OKAY %s // RUN: touch -t 201401240006 %t/other.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck %s diff --git a/test/Driver/PrivateDependencies/fail-simple-fine.swift b/test/Driver/PrivateDependencies/fail-simple-fine.swift index 4d18a57665af2..1d4cb299605e7 100644 --- a/test/Driver/PrivateDependencies/fail-simple-fine.swift +++ b/test/Driver/PrivateDependencies/fail-simple-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/fail-simple-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -12,7 +12,7 @@ // CHECK-FIRST: Handled other.swift // RUN: touch -t 201401240006 %t/bad.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-SECOND: Handled bad.swift @@ -23,7 +23,7 @@ // CHECK-RECORD-DAG: "./main.swift": !private [ // CHECK-RECORD-DAG: "./other.swift": !private [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled main.swift // CHECK-THIRD-DAG: Handled bad.swift diff --git a/test/Driver/PrivateDependencies/fail-with-bad-deps-fine.swift b/test/Driver/PrivateDependencies/fail-with-bad-deps-fine.swift index 6829308e1d3d1..8639ba7d45d17 100644 --- a/test/Driver/PrivateDependencies/fail-with-bad-deps-fine.swift +++ b/test/Driver/PrivateDependencies/fail-with-bad-deps-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -15,14 +15,14 @@ // Reset the .swiftdeps files. // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NONE %s // CHECK-NONE-NOT: Handled // Reset the .swiftdeps files. // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t // RUN: touch -t 201401240006 %t/bad.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s // CHECK-BUILD-ALL-NOT: warning // CHECK-BUILD-ALL: Handled bad.swift @@ -34,7 +34,7 @@ // RUN: cp -r %S/Inputs/fail-with-bad-deps-fine/*.swiftdeps %t // RUN: touch -t 201401240007 %t/bad.swift %t/main.swift -// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s +// RUN: cd %t && not %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies-bad.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./main.swift ./bad.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-WITH-FAIL %s // RUN: %FileCheck -check-prefix=CHECK-RECORD %s < %t/main~buildrecord.swiftdeps // CHECK-WITH-FAIL: Handled main.swift @@ -47,4 +47,4 @@ // CHECK-RECORD-DAG: "./depends-on-main.swift": !private [ // CHECK-RECORD-DAG: "./depends-on-bad.swift": [ -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./bad.swift ./main.swift ./depends-on-main.swift ./depends-on-bad.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-BUILD-ALL %s diff --git a/test/Driver/PrivateDependencies/file-added-fine.swift b/test/Driver/PrivateDependencies/file-added-fine.swift index 5267332ab1c04..b5138e158e222 100644 --- a/test/Driver/PrivateDependencies/file-added-fine.swift +++ b/test/Driver/PrivateDependencies/file-added-fine.swift @@ -4,16 +4,16 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift diff --git a/test/Driver/PrivateDependencies/independent-fine.swift b/test/Driver/PrivateDependencies/independent-fine.swift index 9ac0c744aa73c..c57fe2a2f2ee4 100644 --- a/test/Driver/PrivateDependencies/independent-fine.swift +++ b/test/Driver/PrivateDependencies/independent-fine.swift @@ -4,43 +4,43 @@ // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: ls %t/main~buildrecord.swiftdeps // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // CHECK-FIRST-MULTI: Handled main.swift // CHECK-FIRST-MULTI: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SINGLE %s // CHECK-SINGLE: Handled main.swift // RUN: ls %t/main~buildrecord.swiftdeps diff --git a/test/Driver/PrivateDependencies/independent-half-dirty-fine.swift b/test/Driver/PrivateDependencies/independent-half-dirty-fine.swift index 08cec4506b45a..07abdbcff5cd6 100644 --- a/test/Driver/PrivateDependencies/independent-half-dirty-fine.swift +++ b/test/Driver/PrivateDependencies/independent-half-dirty-fine.swift @@ -2,7 +2,7 @@ // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift @@ -10,14 +10,14 @@ // RUN: touch -t 201401240005 %t/other.o // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled main.swift // CHECK-SECOND: Handled other.swift // CHECK-SECOND-NOT: Handled main.swift // RUN: rm %t/other.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift diff --git a/test/Driver/PrivateDependencies/independent-parseable-fine.swift b/test/Driver/PrivateDependencies/independent-parseable-fine.swift index 84733cd3f5bc3..988306b5509e5 100644 --- a/test/Driver/PrivateDependencies/independent-parseable-fine.swift +++ b/test/Driver/PrivateDependencies/independent-parseable-fine.swift @@ -2,7 +2,7 @@ // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -17,7 +17,7 @@ // CHECK-FIRST: "output": "Handled main.swift{{(\\r)?}}\n" // CHECK-FIRST: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "skipped" @@ -26,14 +26,14 @@ // CHECK-SECOND: {{^}$}} // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/independent-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s // CHECK-FIRST-MULTI: {{^{$}} // CHECK-FIRST-MULTI: "kind": "began" @@ -59,7 +59,7 @@ // CHECK-FIRST-MULTI: "output": "Handled other.swift{{(\\r)?}}\n" // CHECK-FIRST-MULTI: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND-MULTI %s // CHECK-SECOND-MULTI: {{^{$}} // CHECK-SECOND-MULTI: "kind": "skipped" @@ -74,5 +74,5 @@ // CHECK-SECOND-MULTI: {{^}$}} // RUN: touch -t 201401240006 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST-MULTI %s diff --git a/test/Driver/PrivateDependencies/malformed-but-valid-yaml-fine.swift b/test/Driver/PrivateDependencies/malformed-but-valid-yaml-fine.swift index 890d85f72bcc9..94d9ca70fe42c 100644 --- a/test/Driver/PrivateDependencies/malformed-but-valid-yaml-fine.swift +++ b/test/Driver/PrivateDependencies/malformed-but-valid-yaml-fine.swift @@ -3,24 +3,24 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -30,18 +30,18 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/PrivateDependencies/malformed-fine.swift b/test/Driver/PrivateDependencies/malformed-fine.swift index a0b730c410773..e778a0b6cfaee 100644 --- a/test/Driver/PrivateDependencies/malformed-fine.swift +++ b/test/Driver/PrivateDependencies/malformed-fine.swift @@ -3,24 +3,24 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled other.swift // CHECK-SECOND: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -30,18 +30,18 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/malformed-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/PrivateDependencies/mutual-fine.swift b/test/Driver/PrivateDependencies/mutual-fine.swift index 89156276c2fcf..b3352f87f50d1 100644 --- a/test/Driver/PrivateDependencies/mutual-fine.swift +++ b/test/Driver/PrivateDependencies/mutual-fine.swift @@ -4,21 +4,21 @@ // RUN: cp -r %S/Inputs/mutual-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s diff --git a/test/Driver/PrivateDependencies/mutual-interface-hash-fine.swift b/test/Driver/PrivateDependencies/mutual-interface-hash-fine.swift index cd7914f87ba99..2c1b85b77814d 100644 --- a/test/Driver/PrivateDependencies/mutual-interface-hash-fine.swift +++ b/test/Driver/PrivateDependencies/mutual-interface-hash-fine.swift @@ -5,17 +5,17 @@ // RUN: touch -t 201401240005 %t/* // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // CHECK-CLEAN-NOT: Handled // RUN: touch -t 201401240006 %t/does-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CHANGE %s // CHECK-CHANGE-DAG: Handled does-change.swift // CHECK-CHANGE-DAG: Handled does-not-change.swift @@ -24,7 +24,7 @@ // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t // RUN: touch -t 201401240006 %t/does-not-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-NO-CHANGE %s // CHECK-NO-CHANGE-NOT: Handled // CHECK-NO-CHANGE: Handled does-not-change.swift @@ -36,7 +36,7 @@ // Make sure the files really were dependent on one another. // RUN: touch -t 201401240007 %t/does-not-change.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies -driver-always-rebuild-dependents ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s // CHECK-REBUILD-DEPENDENTS-DAG: Handled does-not-change.swift // CHECK-REBUILD-DEPENDENTS-DAG: Handled does-change.swift @@ -47,4 +47,4 @@ // RUN: cp -r %S/Inputs/mutual-interface-hash-fine/*.swiftdeps %t // RUN: sed -E -e 's/"[^"]*does-not-change.swift":/& !dirty/' -i.prev %t/main~buildrecord.swiftdeps -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -enable-direct-intramodule-dependencies ./does-change.swift ./does-not-change.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD-DEPENDENTS %s diff --git a/test/Driver/PrivateDependencies/nominal-members-fine.swift b/test/Driver/PrivateDependencies/nominal-members-fine.swift index 16410e8602231..036a42b45807f 100644 --- a/test/Driver/PrivateDependencies/nominal-members-fine.swift +++ b/test/Driver/PrivateDependencies/nominal-members-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/nominal-members-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled a.swift @@ -12,12 +12,12 @@ // CHECK-INITIAL: Handled depends-on-a-foo.swift // CHECK-INITIAL: Handled depends-on-a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // CHECK-CLEAN-NOT: Handled // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v > %t/touched-a.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v > %t/touched-a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-TOUCHED-A %s < %t/touched-a.txt // RUN: %FileCheck -check-prefix=NEGATIVE-TOUCHED-A %s < %t/touched-a.txt @@ -26,11 +26,11 @@ // CHECK-TOUCHED-A-DAG: Handled depends-on-a-ext.swift // NEGATIVE-TOUCHED-A-NOT: Handled a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-CLEAN %s // RUN: touch -t 201401240007 %t/a-ext.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./a-ext.swift ./depends-on-a-foo.swift ./depends-on-a-ext.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-TOUCHED-EXT %s // CHECK-TOUCHED-EXT-NOT: Handled // CHECK-TOUCHED-EXT: Handled a-ext.swift diff --git a/test/Driver/PrivateDependencies/one-way-depends-after-fine.swift b/test/Driver/PrivateDependencies/one-way-depends-after-fine.swift index 2909800b307fd..2c14d121f0f96 100644 --- a/test/Driver/PrivateDependencies/one-way-depends-after-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-depends-after-fine.swift @@ -6,25 +6,25 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled main.swift // CHECK-SECOND: Handled other.swift // CHECK-SECOND-NOT: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: %empty-directory(%t) @@ -32,25 +32,25 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift // CHECK-THIRD-NOT: Handled other.swift // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-DAG: Handled other.swift // CHECK-FOURTH-DAG: Handled main.swift diff --git a/test/Driver/PrivateDependencies/one-way-depends-before-fine.swift b/test/Driver/PrivateDependencies/one-way-depends-before-fine.swift index 2596b1ee6ebec..d3c45cfda9a1b 100644 --- a/test/Driver/PrivateDependencies/one-way-depends-before-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-depends-before-fine.swift @@ -6,24 +6,24 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-before-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled main.swift // CHECK-SECOND: Handled other.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -35,22 +35,22 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-depends-before-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift // CHECK-FOURTH-NOT: Handled other.swift // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240008 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s diff --git a/test/Driver/PrivateDependencies/one-way-external-delete-fine.swift b/test/Driver/PrivateDependencies/one-way-external-delete-fine.swift index 572210af5073b..c10b5febb09d8 100644 --- a/test/Driver/PrivateDependencies/one-way-external-delete-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-external-delete-fine.swift @@ -2,13 +2,13 @@ // RUN: cp -r %S/Inputs/one-way-external-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled @@ -17,7 +17,7 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: rm %t/other1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift @@ -27,14 +27,14 @@ // RUN: cp -r %S/Inputs/one-way-external-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240005 %t/* // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: rm %t/main1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/PrivateDependencies/one-way-external-fine.swift b/test/Driver/PrivateDependencies/one-way-external-fine.swift index 3d9a16768e551..dc4544bac4404 100644 --- a/test/Driver/PrivateDependencies/one-way-external-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-external-fine.swift @@ -8,13 +8,13 @@ // RUN: cp -r %S/Inputs/one-way-external-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled @@ -23,7 +23,7 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/other1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-DAG: Handled other.swift // CHECK-THIRD-DAG: Handled main.swift @@ -32,14 +32,14 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/other2-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240005 %t/* // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/main1-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift @@ -49,4 +49,4 @@ // RUN: touch -t 201401240006 %t/*.o // RUN: touch -t 201401240004 %t/*-external // RUN: touch -t 203704010005 %t/main2-external -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s diff --git a/test/Driver/PrivateDependencies/one-way-fine.swift b/test/Driver/PrivateDependencies/one-way-fine.swift index 1188e0b294ede..2c1aaf2bf353a 100644 --- a/test/Driver/PrivateDependencies/one-way-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-fine.swift @@ -4,34 +4,34 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: Handled main.swift // CHECK-THIRD: Handled other.swift // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift // CHECK-FOURTH-NOT: Handled other.swift // RUN: rm %t/main.o -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: rm %t/other.o -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIFTH %s // CHECK-FIFTH-NOT: Handled main.swift // CHECK-FIFTH: Handled other.swift @@ -41,34 +41,34 @@ // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // Try modifying the inputs /backwards/ in time rather than forwards. // RUN: touch -t 201401240004 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240004 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s // CHECK-REV-FIRST: Handled other.swift // CHECK-REV-FIRST: Handled main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-SECOND %s // CHECK-REV-SECOND-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./other.swift ./main.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REV-FOURTH %s // CHECK-REV-FOURTH-NOT: Handled other.swift // CHECK-REV-FOURTH: Handled main.swift diff --git a/test/Driver/PrivateDependencies/one-way-merge-module-fine.swift b/test/Driver/PrivateDependencies/one-way-merge-module-fine.swift index 7e05e56c54c1b..b5e2da7cca40e 100644 --- a/test/Driver/PrivateDependencies/one-way-merge-module-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-merge-module-fine.swift @@ -4,14 +4,14 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: Handled main.swift // CHECK-FIRST: Handled other.swift // CHECK-FIRST: Produced master.swiftmodule -// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-NOT: warning // CHECK-SECOND-NOT: Handled diff --git a/test/Driver/PrivateDependencies/one-way-parallel-fine.swift b/test/Driver/PrivateDependencies/one-way-parallel-fine.swift index a5c9b0b273086..8ff7c9a318dbb 100644 --- a/test/Driver/PrivateDependencies/one-way-parallel-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-parallel-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -32,7 +32,7 @@ // CHECK-FIRST: {{^}$}} // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j2 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "began" diff --git a/test/Driver/PrivateDependencies/one-way-parseable-fine.swift b/test/Driver/PrivateDependencies/one-way-parseable-fine.swift index 92267a0c0e6a2..82bd1cfc2b3f8 100644 --- a/test/Driver/PrivateDependencies/one-way-parseable-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-parseable-fine.swift @@ -2,7 +2,7 @@ // RUN: cp -r %S/Inputs/one-way-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST: {{^{$}} @@ -29,7 +29,7 @@ // CHECK-FIRST: "output": "Handled other.swift{{(\\r)?}}\n" // CHECK-FIRST: {{^}$}} -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: {{^{$}} // CHECK-SECOND: "kind": "skipped" @@ -44,7 +44,7 @@ // CHECK-SECOND: {{^}$}} // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD: {{^{$}} // CHECK-THIRD: "kind": "began" @@ -71,7 +71,7 @@ // CHECK-THIRD: {{^}$}} // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -parseable-output 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH: {{^{$}} // CHECK-FOURTH: "kind": "began" diff --git a/test/Driver/PrivateDependencies/one-way-provides-after-fine.swift b/test/Driver/PrivateDependencies/one-way-provides-after-fine.swift index 5fb57ed44f2f8..d33e9fdd3cfef 100644 --- a/test/Driver/PrivateDependencies/one-way-provides-after-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-provides-after-fine.swift @@ -6,42 +6,42 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND-DAG: Handled other.swift // CHECK-SECOND-DAG: Handled main.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // RUN: %empty-directory(%t) // RUN: cp -r %S/Inputs/one-way-provides-after-fine/* %t // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // RUN: touch -t 201401240008 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled other.swift // CHECK-THIRD: Handled main.swift diff --git a/test/Driver/PrivateDependencies/one-way-provides-before-fine.swift b/test/Driver/PrivateDependencies/one-way-provides-before-fine.swift index bf1b48d0d3b5d..5b1951b6549a3 100644 --- a/test/Driver/PrivateDependencies/one-way-provides-before-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-provides-before-fine.swift @@ -6,24 +6,24 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-before-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // CHECK-FIRST-NOT: warning // CHECK-FIRST-NOT: Handled // RUN: touch -t 201401240006 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s // CHECK-SECOND: Handled main.swift // CHECK-SECOND: Handled other.swift // RUN: touch -t 201401240007 %t/other.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-THIRD %s // CHECK-THIRD-NOT: Handled main.swift // CHECK-THIRD: Handled other.swift @@ -34,18 +34,18 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/one-way-provides-before-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s // RUN: touch -t 201401240006 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // RUN: touch -t 201401240007 %t/main.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FOURTH %s // CHECK-FOURTH-NOT: Handled other.swift // CHECK-FOURTH: Handled main.swift diff --git a/test/Driver/PrivateDependencies/one-way-while-editing-fine.swift b/test/Driver/PrivateDependencies/one-way-while-editing-fine.swift index 50b7968d64351..2b7d04de643aa 100644 --- a/test/Driver/PrivateDependencies/one-way-while-editing-fine.swift +++ b/test/Driver/PrivateDependencies/one-way-while-editing-fine.swift @@ -12,7 +12,7 @@ // CHECK: error: input file 'other.swift' was modified during the build // CHECK-NOT: error -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-RECOVER %s // CHECK-RECOVER: Handled main.swift // CHECK-RECOVER: Handled other.swift @@ -27,7 +27,7 @@ // CHECK-REVERSED: error: input file 'main.swift' was modified during the build // CHECK-REVERSED-NOT: error -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./main.swift ./other.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-REVERSED-RECOVER %s // CHECK-REVERSED-RECOVER-NOT: Handled other.swift // CHECK-REVERSED-RECOVER: Handled main.swift diff --git a/test/Driver/PrivateDependencies/private-after-fine.swift b/test/Driver/PrivateDependencies/private-after-fine.swift index d453f717bfa7d..a9fd575eedfb4 100644 --- a/test/Driver/PrivateDependencies/private-after-fine.swift +++ b/test/Driver/PrivateDependencies/private-after-fine.swift @@ -6,18 +6,18 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/private-after-fine/*.swiftdeps %t -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL-NOT: Handled // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt @@ -35,13 +35,13 @@ // RUN: touch -t 201401240005 %t/*.swift // Generate the build record... -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v // ...then reset the .swiftdeps files. // RUN: cp -r %S/Inputs/private-after-fine/*.swiftdeps %t // RUN: touch -t 201401240006 %t/f.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift ./f.swift ./g.swift -module-name main -j1 -v > %t/f.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-F %s < %t/f.txt // RUN: %FileCheck -check-prefix=CHECK-F-NEG %s < %t/f.txt diff --git a/test/Driver/PrivateDependencies/private-fine.swift b/test/Driver/PrivateDependencies/private-fine.swift index 94fde640767b4..90a46a7fdf288 100644 --- a/test/Driver/PrivateDependencies/private-fine.swift +++ b/test/Driver/PrivateDependencies/private-fine.swift @@ -4,7 +4,7 @@ // RUN: cp -r %S/Inputs/private-fine/* %t // RUN: touch -t 201401240005 %t/* -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-INITIAL %s // CHECK-INITIAL-NOT: warning // CHECK-INITIAL: Handled a.swift @@ -14,7 +14,7 @@ // CHECK-INITIAL: Handled e.swift // RUN: touch -t 201401240006 %t/a.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/a.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-A %s < %t/a.txt // RUN: %FileCheck -check-prefix=CHECK-A-NEG %s < %t/a.txt @@ -25,7 +25,7 @@ // CHECK-A-NEG-NOT: Handled e.swift // RUN: touch -t 201401240006 %t/b.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/b.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-B %s < %t/b.txt // RUN: %FileCheck -check-prefix=CHECK-B-NEG %s < %t/b.txt @@ -36,7 +36,7 @@ // CHECK-B-NEG-NOT: Handled e.swift // RUN: touch -t 201401240006 %t/c.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/c.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-C %s < %t/c.txt // RUN: %FileCheck -check-prefix=CHECK-C-NEG %s < %t/c.txt @@ -47,7 +47,7 @@ // CHECK-C-NEG-NOT: Handled e.swift // RUN: touch -t 201401240006 %t/d.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/d.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-D %s < %t/d.txt // RUN: %FileCheck -check-prefix=CHECK-D-NEG %s < %t/d.txt @@ -58,7 +58,7 @@ // CHECK-D-NEG-NOT: Handled e.swift // RUN: touch -t 201401240006 %t/e.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/e.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-E %s < %t/e.txt // RUN: %FileCheck -check-prefix=CHECK-E-NEG %s < %t/e.txt @@ -75,7 +75,7 @@ // CHECK-E-NEG-NOT: Handled b.swift // RUN: touch -t 201401240007 %t/a.swift %t/e.swift -// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1 +// RUN: cd %t && %swiftc_driver -c -driver-use-frontend-path "%{python};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents -enable-direct-intramodule-dependencies ./a.swift ./b.swift ./c.swift ./d.swift ./e.swift -module-name main -j1 -v > %t/ae.txt 2>&1 // RUN: %FileCheck -check-prefix=CHECK-AE %s < %t/ae.txt // RUN: %FileCheck -check-prefix=CHECK-AE-NEG %s < %t/ae.txt diff --git a/test/Frontend/dependencies-fine.swift b/test/Frontend/dependencies-fine.swift index 883ee07ebbcc8..f7256e925cfb0 100644 --- a/test/Frontend/dependencies-fine.swift +++ b/test/Frontend/dependencies-fine.swift @@ -6,12 +6,12 @@ // RUN: %target-swift-frontend -emit-dependencies-path - -resolve-imports "%S/../Inputs/empty file.swift" | %FileCheck -check-prefix=CHECK-BASIC %s // RUN: %target-swift-frontend -emit-reference-dependencies-path - -typecheck -primary-file "%S/../Inputs/empty file.swift" > %t.swiftdeps -// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-BASIC-YAML %s <%t-processed.swiftdeps // RUN: %target-swift-frontend -emit-dependencies-path %t.d -emit-reference-dependencies-path %t.swiftdeps -typecheck -primary-file "%S/../Inputs/empty file.swift" // RUN: %FileCheck -check-prefix=CHECK-BASIC %s < %t.d -// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-BASIC-YAML %s < %t-processed.swiftdeps // CHECK-BASIC-LABEL: - : @@ -48,7 +48,7 @@ // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/dependencies/extra-header.h -track-system-dependencies -emit-dependencies-path - -resolve-imports %s | %FileCheck -check-prefix=CHECK-IMPORT-TRACK-SYSTEM %s // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -disable-objc-attr-requires-foundation-module -import-objc-header %S/Inputs/dependencies/extra-header.h -emit-reference-dependencies-path %t.swiftdeps -typecheck -primary-file %s -// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-IMPORT-YAML %s <%t-processed.swiftdeps // CHECK-IMPORT-LABEL: - : diff --git a/test/Frontend/dependencies-preservation-fine.swift b/test/Frontend/dependencies-preservation-fine.swift index 03f88fc1c2bf6..4e2a29865a789 100644 --- a/test/Frontend/dependencies-preservation-fine.swift +++ b/test/Frontend/dependencies-preservation-fine.swift @@ -11,7 +11,7 @@ // First, produce the dependency files and verify their contents. // RUN: %target-swift-frontend -emit-reference-dependencies-path %t.swiftdeps -typecheck -primary-file "%S/../Inputs/empty file.swift" -// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK %s < %t-processed.swiftdeps // CHECK-NOT: topLevel{{.*}}EmptyStruct{{.*}}true @@ -22,7 +22,7 @@ // file. // RUN: %target-swift-frontend -emit-reference-dependencies-path %t.swiftdeps -typecheck -primary-file %S/../Inputs/global_resilience.swift // RUN: %FileCheck -check-prefix=CHECK %s < %t.swiftdeps~ -// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-OVERWRITTEN %s < %t-processed.swiftdeps // CHECK-OVERWRITTEN:topLevel{{.*}}EmptyStruct{{.*}}true diff --git a/test/Incremental/Dependencies/private-function-fine.swift b/test/Incremental/Dependencies/private-function-fine.swift index 831a3868a4e77..81d2594b9a02a 100644 --- a/test/Incremental/Dependencies/private-function-fine.swift +++ b/test/Incremental/Dependencies/private-function-fine.swift @@ -2,12 +2,12 @@ // Also uses awk: // XFAIL OS=windows -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-OLD +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-NEW +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private func testParamType(_: InterestingType) {} diff --git a/test/Incremental/Dependencies/private-function-return-type-fine.swift b/test/Incremental/Dependencies/private-function-return-type-fine.swift index fbca3430d4c40..70efbdb644918 100644 --- a/test/Incremental/Dependencies/private-function-return-type-fine.swift +++ b/test/Incremental/Dependencies/private-function-return-type-fine.swift @@ -2,12 +2,12 @@ // Also uses awk: // XFAIL OS=windows -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-OLD +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-NEW +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private func testReturnType() -> InterestingType { fatalError() } diff --git a/test/Incremental/Dependencies/private-protocol-conformer-ext-fine.swift b/test/Incremental/Dependencies/private-protocol-conformer-ext-fine.swift index 0688c573d42e5..49330bda51a75 100644 --- a/test/Incremental/Dependencies/private-protocol-conformer-ext-fine.swift +++ b/test/Incremental/Dependencies/private-protocol-conformer-ext-fine.swift @@ -3,11 +3,11 @@ // XFAIL OS=windows // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private struct Test {} diff --git a/test/Incremental/Dependencies/private-protocol-conformer-fine.swift b/test/Incremental/Dependencies/private-protocol-conformer-fine.swift index 7abe04b7e016f..53341cbd708db 100644 --- a/test/Incremental/Dependencies/private-protocol-conformer-fine.swift +++ b/test/Incremental/Dependencies/private-protocol-conformer-fine.swift @@ -2,12 +2,12 @@ // Also uses awk: // XFAIL OS=windows -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-OLD +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-NEW +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private struct Test : InterestingProto {} diff --git a/test/Incremental/Dependencies/private-struct-member-fine.swift b/test/Incremental/Dependencies/private-struct-member-fine.swift index de059f9804dda..51bf1a8008d3f 100644 --- a/test/Incremental/Dependencies/private-struct-member-fine.swift +++ b/test/Incremental/Dependencies/private-struct-member-fine.swift @@ -2,12 +2,12 @@ // Also uses awk: // XFAIL OS=windows -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-OLD +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-NEW +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private struct Wrapper { diff --git a/test/Incremental/Dependencies/private-subscript-fine.swift b/test/Incremental/Dependencies/private-subscript-fine.swift index e113b15c108b6..61ab508d1e7bd 100644 --- a/test/Incremental/Dependencies/private-subscript-fine.swift +++ b/test/Incremental/Dependencies/private-subscript-fine.swift @@ -2,12 +2,12 @@ // Also uses awk: // XFAIL OS=windows -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-OLD +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-NEW +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps struct Wrapper { diff --git a/test/Incremental/Dependencies/private-typealias-fine.swift b/test/Incremental/Dependencies/private-typealias-fine.swift index 20957a091b653..3b4491ea33677 100644 --- a/test/Incremental/Dependencies/private-typealias-fine.swift +++ b/test/Incremental/Dependencies/private-typealias-fine.swift @@ -2,12 +2,12 @@ // Also uses awk: // XFAIL OS=windows -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-OLD +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps -// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -disable-direct-intramodule-dependencies -emit-reference-dependencies-path %t.swiftdeps -module-name main | %FileCheck %s -check-prefix=CHECK-NEW +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private struct Wrapper { diff --git a/test/Incremental/Dependencies/private-var-fine.swift b/test/Incremental/Dependencies/private-var-fine.swift index 0f9157953cea9..d5d0901800d2b 100644 --- a/test/Incremental/Dependencies/private-var-fine.swift +++ b/test/Incremental/Dependencies/private-var-fine.swift @@ -4,7 +4,7 @@ // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -disable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps diff --git a/test/Incremental/Dependencies/reference-dependencies-dynamic-lookup-fine.swift b/test/Incremental/Dependencies/reference-dependencies-dynamic-lookup-fine.swift index 861863d686a3d..092b0e2f1e56b 100644 --- a/test/Incremental/Dependencies/reference-dependencies-dynamic-lookup-fine.swift +++ b/test/Incremental/Dependencies/reference-dependencies-dynamic-lookup-fine.swift @@ -4,12 +4,12 @@ // RUN: %empty-directory(%t) // RUN: cp %s %t/main.swift -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -disable-direct-intramodule-dependencies -primary-file %t/main.swift -emit-reference-dependencies-path - > %t.swiftdeps +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -primary-file %t/main.swift -disable-direct-intramodule-dependencies -emit-reference-dependencies-path - > %t.swiftdeps // Check that the output is deterministic. -// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -disable-direct-intramodule-dependencies -primary-file %t/main.swift -emit-reference-dependencies-path - > %t-2.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t-2.swiftdeps >%t-2-processed.swiftdeps +// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -primary-file %t/main.swift -disable-direct-intramodule-dependencies -emit-reference-dependencies-path - > %t-2.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t-2.swiftdeps %t-2-processed.swiftdeps // RUN: diff %t-processed.swiftdeps %t-2-processed.swiftdeps // RUN: %FileCheck %s < %t-processed.swiftdeps diff --git a/test/Incremental/Dependencies/reference-dependencies-fine.swift b/test/Incremental/Dependencies/reference-dependencies-fine.swift index ea311fffc8572..81de9852e34d9 100644 --- a/test/Incremental/Dependencies/reference-dependencies-fine.swift +++ b/test/Incremental/Dependencies/reference-dependencies-fine.swift @@ -11,8 +11,8 @@ // RUN: %target-swift-frontend -fine-grained-dependency-include-intrafile -typecheck -disable-direct-intramodule-dependencies -primary-file %t/main.swift %S/../Inputs/reference-dependencies-helper.swift -emit-reference-dependencies-path - > %t-2.swiftdeps // Merge each entry onto one line and sort to overcome order differences -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t-2.swiftdeps >%t-2-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t-2.swiftdeps %t-2-processed.swiftdeps // RUN: diff %t-processed.swiftdeps %t-2-processed.swiftdeps // RUN: %FileCheck -check-prefix=NEGATIVE %s < %t-processed.swiftdeps diff --git a/test/Incremental/Dependencies/reference-dependencies-members-fine.swift b/test/Incremental/Dependencies/reference-dependencies-members-fine.swift index 71de041cdc29a..27a25ead26d7b 100644 --- a/test/Incremental/Dependencies/reference-dependencies-members-fine.swift +++ b/test/Incremental/Dependencies/reference-dependencies-members-fine.swift @@ -6,11 +6,11 @@ // RUN: cp %s %t/main.swift // Need -fine-grained-dependency-include-intrafile to be invarient wrt type-body-fingerprints enabled/disabled -// RUN: %target-swift-frontend -fine-grained-dependency-include-intrafile -typecheck -disable-direct-intramodule-dependencies -primary-file %t/main.swift %S/../Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - > %t.swiftdeps +// RUN: %target-swift-frontend -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/../Inputs/reference-dependencies-members-helper.swift -disable-direct-intramodule-dependencies -emit-reference-dependencies-path - > %t.swiftdeps -// RUN: %target-swift-frontend -fine-grained-dependency-include-intrafile -typecheck -disable-direct-intramodule-dependencies -primary-file %t/main.swift %S/../Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - > %t-2.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t-2.swiftdeps >%t-2-processed.swiftdeps +// RUN: %target-swift-frontend -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/../Inputs/reference-dependencies-members-helper.swift -disable-direct-intramodule-dependencies -emit-reference-dependencies-path - > %t-2.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t-2.swiftdeps %t-2-processed.swiftdeps // RUN: diff %t-processed.swiftdeps %t-2-processed.swiftdeps diff --git a/test/Incremental/PrivateDependencies/private-function-fine.swift b/test/Incremental/PrivateDependencies/private-function-fine.swift index 8df8fc0b6a231..701993af63a37 100644 --- a/test/Incremental/PrivateDependencies/private-function-fine.swift +++ b/test/Incremental/PrivateDependencies/private-function-fine.swift @@ -3,11 +3,11 @@ // XFAIL OS=windows // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private func testParamType(_: InterestingType) {} diff --git a/test/Incremental/PrivateDependencies/private-function-return-type-fine.swift b/test/Incremental/PrivateDependencies/private-function-return-type-fine.swift index 1edb3b055c2b4..b519f71d2972b 100644 --- a/test/Incremental/PrivateDependencies/private-function-return-type-fine.swift +++ b/test/Incremental/PrivateDependencies/private-function-return-type-fine.swift @@ -3,11 +3,11 @@ // XFAIL OS=windows // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private func testReturnType() -> InterestingType { fatalError() } diff --git a/test/Incremental/PrivateDependencies/private-protocol-conformer-ext-fine.swift b/test/Incremental/PrivateDependencies/private-protocol-conformer-ext-fine.swift index 3e48ce8cde141..5a8ad95c8ea38 100644 --- a/test/Incremental/PrivateDependencies/private-protocol-conformer-ext-fine.swift +++ b/test/Incremental/PrivateDependencies/private-protocol-conformer-ext-fine.swift @@ -3,11 +3,11 @@ // XFAIL OS=windows // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private struct Test {} diff --git a/test/Incremental/PrivateDependencies/private-protocol-conformer-fine.swift b/test/Incremental/PrivateDependencies/private-protocol-conformer-fine.swift index f30c6ef106be1..7b417286438a3 100644 --- a/test/Incremental/PrivateDependencies/private-protocol-conformer-fine.swift +++ b/test/Incremental/PrivateDependencies/private-protocol-conformer-fine.swift @@ -3,11 +3,11 @@ // XFAIL OS=windows // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private struct Test : InterestingProto {} diff --git a/test/Incremental/PrivateDependencies/private-struct-member-fine.swift b/test/Incremental/PrivateDependencies/private-struct-member-fine.swift index e231a68dfdae5..0f29734faa0a5 100644 --- a/test/Incremental/PrivateDependencies/private-struct-member-fine.swift +++ b/test/Incremental/PrivateDependencies/private-struct-member-fine.swift @@ -3,11 +3,11 @@ // XFAIL OS=windows // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private struct Wrapper { diff --git a/test/Incremental/PrivateDependencies/private-subscript-fine.swift b/test/Incremental/PrivateDependencies/private-subscript-fine.swift index 2d12a7972e690..d33ec6232d1e1 100644 --- a/test/Incremental/PrivateDependencies/private-subscript-fine.swift +++ b/test/Incremental/PrivateDependencies/private-subscript-fine.swift @@ -3,11 +3,11 @@ // XFAIL OS=windows // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps struct Wrapper { diff --git a/test/Incremental/PrivateDependencies/private-typealias-fine.swift b/test/Incremental/PrivateDependencies/private-typealias-fine.swift index a24e27cce8305..20cabd8eb0464 100644 --- a/test/Incremental/PrivateDependencies/private-typealias-fine.swift +++ b/test/Incremental/PrivateDependencies/private-typealias-fine.swift @@ -3,11 +3,11 @@ // XFAIL OS=windows // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DNEW -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-NEW -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps private struct Wrapper { diff --git a/test/Incremental/PrivateDependencies/private-var-fine.swift b/test/Incremental/PrivateDependencies/private-var-fine.swift index 704b195a14cc3..3a849b4c1267a 100644 --- a/test/Incremental/PrivateDependencies/private-var-fine.swift +++ b/test/Incremental/PrivateDependencies/private-var-fine.swift @@ -4,7 +4,7 @@ // RUN: %target-swift-frontend -emit-silgen -primary-file %s %S/Inputs/InterestingType.swift -DOLD -emit-reference-dependencies-path %t.swiftdeps -module-name main -enable-direct-intramodule-dependencies | %FileCheck %s -check-prefix=CHECK-OLD -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps // RUN: %FileCheck -check-prefix=CHECK-DEPS %s < %t-processed.swiftdeps diff --git a/test/Incremental/PrivateDependencies/reference-dependencies-dynamic-lookup-fine.swift b/test/Incremental/PrivateDependencies/reference-dependencies-dynamic-lookup-fine.swift index 2da5c38919347..c4c42c752ecf7 100644 --- a/test/Incremental/PrivateDependencies/reference-dependencies-dynamic-lookup-fine.swift +++ b/test/Incremental/PrivateDependencies/reference-dependencies-dynamic-lookup-fine.swift @@ -8,8 +8,8 @@ // Check that the output is deterministic. // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -primary-file %t/main.swift -emit-reference-dependencies-path - -enable-direct-intramodule-dependencies > %t-2.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t-2.swiftdeps >%t-2-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t-2.swiftdeps %t-2-processed.swiftdeps // RUN: diff %t-processed.swiftdeps %t-2-processed.swiftdeps // RUN: %FileCheck %s < %t-processed.swiftdeps diff --git a/test/Incremental/PrivateDependencies/reference-dependencies-fine.swift b/test/Incremental/PrivateDependencies/reference-dependencies-fine.swift index 99a8fbd2e4ff9..eb05e967c9c4f 100644 --- a/test/Incremental/PrivateDependencies/reference-dependencies-fine.swift +++ b/test/Incremental/PrivateDependencies/reference-dependencies-fine.swift @@ -11,8 +11,8 @@ // RUN: %target-swift-frontend -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/../Inputs/reference-dependencies-helper.swift -emit-reference-dependencies-path - -enable-direct-intramodule-dependencies > %t-2.swiftdeps // Merge each entry onto one line and sort to overcome order differences -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t-2.swiftdeps >%t-2-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t-2.swiftdeps %t-2-processed.swiftdeps // RUN: diff %t-processed.swiftdeps %t-2-processed.swiftdeps // RUN: %FileCheck -check-prefix=NEGATIVE %s < %t-processed.swiftdeps diff --git a/test/Incremental/PrivateDependencies/reference-dependencies-members-fine.swift b/test/Incremental/PrivateDependencies/reference-dependencies-members-fine.swift index 554694628e3b3..84e8f31141749 100644 --- a/test/Incremental/PrivateDependencies/reference-dependencies-members-fine.swift +++ b/test/Incremental/PrivateDependencies/reference-dependencies-members-fine.swift @@ -9,8 +9,8 @@ // RUN: %target-swift-frontend -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/../Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - -enable-direct-intramodule-dependencies > %t.swiftdeps // RUN: %target-swift-frontend -fine-grained-dependency-include-intrafile -typecheck -primary-file %t/main.swift %S/../Inputs/reference-dependencies-members-helper.swift -emit-reference-dependencies-path - -enable-direct-intramodule-dependencies > %t-2.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t.swiftdeps >%t-processed.swiftdeps -// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh <%t-2.swiftdeps >%t-2-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t.swiftdeps %t-processed.swiftdeps +// RUN: %S/../../Inputs/process_fine_grained_swiftdeps.sh %swift-dependency-tool %t-2.swiftdeps %t-2-processed.swiftdeps // RUN: diff %t-processed.swiftdeps %t-2-processed.swiftdeps diff --git a/test/Inputs/process_fine_grained_swiftdeps.sh b/test/Inputs/process_fine_grained_swiftdeps.sh index 9d3426ccbd047..fb91c3875e95e 100755 --- a/test/Inputs/process_fine_grained_swiftdeps.sh +++ b/test/Inputs/process_fine_grained_swiftdeps.sh @@ -4,4 +4,6 @@ # # Also sort for consistency, since the node order can vary. -awk '/kind:/ {k = $2}; /aspect:/ {a = $2}; /context:/ {c = $2}; /name/ {n = $2}; /sequenceNumber/ {s = $2}; /isProvides:/ {print k, a, c, n, $2}' | sort +${1} --to-yaml --input-filename=${2} --output-filename=${3}.tmp + +awk '/kind:/ {k = $2}; /aspect:/ {a = $2}; /context:/ {c = $2}; /name/ {n = $2}; /sequenceNumber/ {s = $2}; /isProvides:/ {print k, a, c, n, $2}' < ${3}.tmp | sort > ${3} \ No newline at end of file diff --git a/test/Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh b/test/Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh index 80bb392c22cfb..2e117cd7a35d5 100755 --- a/test/Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh +++ b/test/Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh @@ -4,4 +4,6 @@ # # Also sort for consistency, since the node order can vary. -awk '/kind:/ {k = $2; f = ""}; /aspect:/ {a = $2}; /context:/ {c = $2}; /name/ {n = $2}; /sequenceNumber/ {s = $2}; /fingerprint:/ {f = $2 }; /isProvides:/ {isP = $2; print k, a, c, n, isP, f}' | sort +${1} --to-yaml --input-filename=${2} --output-filename=${3}.tmp + +awk '/kind:/ {k = $2; f = ""}; /aspect:/ {a = $2}; /context:/ {c = $2}; /name/ {n = $2}; /sequenceNumber/ {s = $2}; /fingerprint:/ {f = $2 }; /isProvides:/ {isP = $2; print k, a, c, n, isP, f}' < ${3}.tmp | sort > ${3} diff --git a/test/InterfaceHash/added_method-type-fingerprints.swift b/test/InterfaceHash/added_method-type-fingerprints.swift index 7b51e1f67b758..6776e086a7559 100644 --- a/test/InterfaceHash/added_method-type-fingerprints.swift +++ b/test/InterfaceHash/added_method-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_class_private_property-type-fingerprints.swift b/test/InterfaceHash/added_private_class_private_property-type-fingerprints.swift index cf3a104cc71b1..5ba9627ce2731 100644 --- a/test/InterfaceHash/added_private_class_private_property-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_class_private_property-type-fingerprints.swift @@ -6,10 +6,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_class_property-type-fingerprints.swift b/test/InterfaceHash/added_private_class_property-type-fingerprints.swift index f4e01619c1b76..d087848dd323f 100644 --- a/test/InterfaceHash/added_private_class_property-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_class_property-type-fingerprints.swift @@ -6,10 +6,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_enum_private_property-type-fingerprints.swift b/test/InterfaceHash/added_private_enum_private_property-type-fingerprints.swift index 9ad0b28d56449..ed898ffdce3d1 100644 --- a/test/InterfaceHash/added_private_enum_private_property-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_enum_private_property-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_enum_property-type-fingerprints.swift b/test/InterfaceHash/added_private_enum_property-type-fingerprints.swift index c8220f6f9a54b..0589feefd6214 100644 --- a/test/InterfaceHash/added_private_enum_property-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_enum_property-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_method-type-fingerprints.swift b/test/InterfaceHash/added_private_method-type-fingerprints.swift index c0c60206d9c92..f6b8236e94b64 100644 --- a/test/InterfaceHash/added_private_method-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_method-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_method_value_types-type-fingerprints.swift b/test/InterfaceHash/added_private_method_value_types-type-fingerprints.swift index 42fee00e31bf0..8499fbd0ea835 100644 --- a/test/InterfaceHash/added_private_method_value_types-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_method_value_types-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_protocol_method-type-fingerprints.swift b/test/InterfaceHash/added_private_protocol_method-type-fingerprints.swift index c0ccd54a11771..f029cdb8b803d 100644 --- a/test/InterfaceHash/added_private_protocol_method-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_protocol_method-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_protocol_property-type-fingerprints.swift b/test/InterfaceHash/added_private_protocol_property-type-fingerprints.swift index c27cee3752b83..4a51a0df7957b 100644 --- a/test/InterfaceHash/added_private_protocol_property-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_protocol_property-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_struct_private_property-type-fingerprints.swift b/test/InterfaceHash/added_private_struct_private_property-type-fingerprints.swift index 47e371aff0901..b5d20cf3b317c 100644 --- a/test/InterfaceHash/added_private_struct_private_property-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_struct_private_property-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/added_private_struct_property-type-fingerprints.swift b/test/InterfaceHash/added_private_struct_property-type-fingerprints.swift index bd92b5dfbe37f..f27418b9036ff 100644 --- a/test/InterfaceHash/added_private_struct_property-type-fingerprints.swift +++ b/test/InterfaceHash/added_private_struct_property-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: not diff %t/{a,b}-processed.swiftdeps >%t/diffs diff --git a/test/InterfaceHash/edited_method_body-type-fingerprints.swift b/test/InterfaceHash/edited_method_body-type-fingerprints.swift index 10ae3e000c09f..726a36d8ba931 100644 --- a/test/InterfaceHash/edited_method_body-type-fingerprints.swift +++ b/test/InterfaceHash/edited_method_body-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: cmp %t/{a,b}-processed.swiftdeps diff --git a/test/InterfaceHash/edited_property_getter-type-fingerprints.swift b/test/InterfaceHash/edited_property_getter-type-fingerprints.swift index 0a0b5fdaaff54..9024944bd865c 100644 --- a/test/InterfaceHash/edited_property_getter-type-fingerprints.swift +++ b/test/InterfaceHash/edited_property_getter-type-fingerprints.swift @@ -9,10 +9,10 @@ // RUN: %{python} %utils/split_file.py -o %t %s // RUN: cp %t/{a,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/a-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/a-processed.swiftdeps // RUN: cp %t/{b,x}.swift // RUN: %target-swift-frontend -typecheck -enable-type-fingerprints -primary-file %t/x.swift -emit-reference-dependencies-path %t/x.swiftdeps -module-name main -// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh <%t/x.swiftdeps >%t/b-processed.swiftdeps +// RUN: %S/../Inputs/process_fine_grained_swiftdeps_with_fingerprints.sh %swift-dependency-tool %t/x.swiftdeps %t/b-processed.swiftdeps // RUN: cmp %t/{a,b}-processed.swiftdeps diff --git a/test/lit.cfg b/test/lit.cfg index 06db7787248a2..81c20d27225ad 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -247,6 +247,7 @@ config.sil_nm = inferSwiftBinary('sil-nm') config.sil_passpipeline_dumper = inferSwiftBinary('sil-passpipeline-dumper') config.lldb_moduleimport_test = inferSwiftBinary('lldb-moduleimport-test') config.swift_ide_test = inferSwiftBinary('swift-ide-test') +config.swift_dependency_tool = inferSwiftBinary('swift-dependency-tool') config.swift_syntax_test = inferSwiftBinary('swift-syntax-test') if 'syntax_parser_lib' in config.available_features: config.swift_syntax_parser_test = inferSwiftBinary('swift-syntax-parser-test') @@ -398,6 +399,7 @@ config.substitutions.append( ('%lldb-moduleimport-test-with-sdk', config.substitutions.append( ('%swift-dump-pcm', "%r -dump-pcm" % config.swiftc) ) config.substitutions.append( ('%swift-ide-test_plain', config.swift_ide_test) ) config.substitutions.append( ('%swift-ide-test', "%r %s %s -swift-version %s" % (config.swift_ide_test, mcp_opt, ccp_opt, swift_version)) ) +config.substitutions.append( ('%swift-dependency-tool', config.swift_dependency_tool) ) config.substitutions.append( ('%swift-syntax-test', config.swift_syntax_test) ) if 'syntax_parser_lib' in config.available_features: config.substitutions.append( ('%swift-syntax-parser-test', config.swift_syntax_parser_test) ) From 53931c06a6a806812cfccd53e37076ecb01c8b34 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 10 Jun 2020 15:35:37 -0400 Subject: [PATCH 7/8] Dependencies: Remove apparently-unused test inputs --- .../chained-additional-kinds/main.swift | 3 -- .../chained-additional-kinds/other.swift | 2 -- .../chained-additional-kinds/output.json | 17 ---------- .../yet-another.swift | 2 -- .../Inputs/chained-after/main.swift | 3 -- .../Inputs/chained-after/main.swiftdeps | 2 -- .../Inputs/chained-after/other.swift | 2 -- .../Inputs/chained-after/other.swiftdeps | 2 -- .../Inputs/chained-after/output.json | 17 ---------- .../Inputs/chained-after/yet-another.swift | 2 -- .../chained-after/yet-another.swiftdeps | 2 -- .../main.swift | 4 --- .../main.swiftdeps | 4 --- .../other.swift | 2 -- .../other.swiftdeps | 2 -- .../output.json | 17 ---------- .../yet-another.swift | 2 -- .../yet-another.swiftdeps | 2 -- .../chained-private-after-multiple/main.swift | 3 -- .../main.swiftdeps | 3 -- .../other.swift | 2 -- .../other.swiftdeps | 2 -- .../output.json | 17 ---------- .../yet-another.swift | 2 -- .../yet-another.swiftdeps | 2 -- .../Inputs/chained-private-after/main.swift | 3 -- .../chained-private-after/main.swiftdeps | 3 -- .../Inputs/chained-private-after/other.swift | 2 -- .../chained-private-after/other.swiftdeps | 2 -- .../Inputs/chained-private-after/output.json | 17 ---------- .../chained-private-after/yet-another.swift | 2 -- .../yet-another.swiftdeps | 2 -- .../Inputs/chained-private/main.swift | 3 -- .../Inputs/chained-private/other.swift | 2 -- .../Inputs/chained-private/output.json | 17 ---------- .../Inputs/chained-private/yet-another.swift | 2 -- .../Inputs/crash-simple/crash.swift | 2 -- .../Inputs/crash-simple/main.swift | 2 -- .../Inputs/crash-simple/other.swift | 2 -- .../Inputs/crash-simple/output.json | 17 ---------- .../Dependencies/Inputs/fail-chained/a.swift | 2 -- .../Dependencies/Inputs/fail-chained/b.swift | 2 -- .../Inputs/fail-chained/bad.swift | 3 -- .../Dependencies/Inputs/fail-chained/c.swift | 3 -- .../Dependencies/Inputs/fail-chained/d.swift | 3 -- .../Dependencies/Inputs/fail-chained/e.swift | 3 -- .../Dependencies/Inputs/fail-chained/f.swift | 3 -- .../Inputs/fail-chained/output.json | 33 ------------------- .../Inputs/fail-interface-hash/bad.swift | 3 -- .../Inputs/fail-interface-hash/bad.swiftdeps | 3 -- .../fail-interface-hash/depends-on-bad.swift | 3 -- .../depends-on-bad.swiftdeps | 3 -- .../fail-interface-hash/depends-on-main.swift | 3 -- .../depends-on-main.swiftdeps | 3 -- .../Inputs/fail-interface-hash/main.swift | 3 -- .../Inputs/fail-interface-hash/main.swiftdeps | 3 -- .../Inputs/fail-interface-hash/output.json | 21 ------------ .../Dependencies/Inputs/fail-simple/bad.swift | 2 -- .../Inputs/fail-simple/main.swift | 2 -- .../Inputs/fail-simple/other.swift | 2 -- .../Inputs/fail-simple/output.json | 17 ---------- .../Inputs/fail-with-bad-deps/bad.swift | 4 --- .../Inputs/fail-with-bad-deps/bad.swiftdeps | 3 -- .../fail-with-bad-deps/depends-on-bad.swift | 3 -- .../depends-on-bad.swiftdeps | 3 -- .../fail-with-bad-deps/depends-on-main.swift | 3 -- .../depends-on-main.swiftdeps | 3 -- .../Inputs/fail-with-bad-deps/main.swift | 3 -- .../Inputs/fail-with-bad-deps/main.swiftdeps | 3 -- .../Inputs/fail-with-bad-deps/output.json | 21 ------------ .../Inputs/independent/main.swift | 1 - .../Inputs/independent/other.swift | 1 - .../Inputs/independent/output.json | 13 -------- .../Inputs/malformed-after/main.swift | 2 -- .../Inputs/malformed-after/main.swiftdeps | 2 -- .../Inputs/malformed-after/other.swift | 2 -- .../Inputs/malformed-after/other.swiftdeps | 1 - .../Inputs/malformed-after/output.json | 13 -------- .../malformed-but-valid-yaml/main.swift | 2 -- .../malformed-but-valid-yaml/main.swiftdeps | 2 -- .../malformed-but-valid-yaml/other.swift | 2 -- .../malformed-but-valid-yaml/other.swiftdeps | 1 - .../malformed-but-valid-yaml/output.json | 13 -------- .../mutual-interface-hash/does-change.swift | 4 --- .../does-change.swiftdeps | 4 --- .../does-not-change.swift | 4 --- .../does-not-change.swiftdeps | 4 --- .../Inputs/mutual-interface-hash/output.json | 13 -------- .../Inputs/mutual-with-swiftdeps/main.swift | 3 -- .../mutual-with-swiftdeps/main.swiftdeps | 0 .../Inputs/mutual-with-swiftdeps/other.swift | 3 -- .../mutual-with-swiftdeps/other.swiftdeps | 0 .../Inputs/mutual-with-swiftdeps/output.json | 13 -------- .../Dependencies/Inputs/mutual/main.swift | 3 -- .../Dependencies/Inputs/mutual/other.swift | 3 -- .../Dependencies/Inputs/mutual/output.json | 13 -------- .../Inputs/nominal-members/a-ext.swift | 2 -- .../Inputs/nominal-members/a.swift | 3 -- .../nominal-members/depends-on-a-ext.swift | 3 -- .../nominal-members/depends-on-a-foo.swift | 3 -- .../Inputs/nominal-members/output.json | 21 ------------ .../Inputs/one-way-depends-after/main.swift | 2 -- .../one-way-depends-after/main.swiftdeps | 1 - .../Inputs/one-way-depends-after/other.swift | 2 -- .../one-way-depends-after/other.swiftdeps | 2 -- .../Inputs/one-way-depends-after/output.json | 13 -------- .../Inputs/one-way-depends-before/main.swift | 1 - .../one-way-depends-before/main.swiftdeps | 2 -- .../Inputs/one-way-depends-before/other.swift | 2 -- .../one-way-depends-before/other.swiftdeps | 2 -- .../Inputs/one-way-depends-before/output.json | 13 -------- .../Inputs/one-way-external/main.swift | 3 -- .../Inputs/one-way-external/main1-external | 0 .../Inputs/one-way-external/main2-external | 0 .../Inputs/one-way-external/other.swift | 3 -- .../Inputs/one-way-external/other1-external | 0 .../Inputs/one-way-external/other2-external | 0 .../Inputs/one-way-external/output.json | 13 -------- .../Inputs/one-way-provides-after/main.swift | 2 -- .../one-way-provides-after/main.swiftdeps | 2 -- .../Inputs/one-way-provides-after/other.swift | 2 -- .../one-way-provides-after/other.swiftdeps | 1 - .../Inputs/one-way-provides-after/output.json | 13 -------- .../Inputs/one-way-provides-before/main.swift | 2 -- .../one-way-provides-before/main.swiftdeps | 2 -- .../one-way-provides-before/other.swift | 1 - .../one-way-provides-before/other.swiftdeps | 2 -- .../one-way-provides-before/output.json | 13 -------- .../Inputs/one-way-with-swiftdeps/main.swift | 2 -- .../one-way-with-swiftdeps/main.swiftdeps | 0 .../Inputs/one-way-with-swiftdeps/other.swift | 2 -- .../one-way-with-swiftdeps/other.swiftdeps | 0 .../Inputs/one-way-with-swiftdeps/output.json | 17 ---------- .../Dependencies/Inputs/private-after/a.swift | 2 -- .../Inputs/private-after/a.swiftdeps | 2 -- .../Dependencies/Inputs/private-after/b.swift | 3 -- .../Inputs/private-after/b.swiftdeps | 3 -- .../Dependencies/Inputs/private-after/c.swift | 3 -- .../Inputs/private-after/c.swiftdeps | 3 -- .../Dependencies/Inputs/private-after/d.swift | 3 -- .../Inputs/private-after/d.swiftdeps | 3 -- .../Dependencies/Inputs/private-after/e.swift | 3 -- .../Inputs/private-after/e.swiftdeps | 3 -- .../Dependencies/Inputs/private-after/f.swift | 3 -- .../Inputs/private-after/f.swiftdeps | 3 -- .../Dependencies/Inputs/private-after/g.swift | 3 -- .../Inputs/private-after/g.swiftdeps | 3 -- .../Inputs/private-after/output.json | 33 ------------------- .../chained-additional-kinds/main.swift | 3 -- .../chained-additional-kinds/other.swift | 2 -- .../chained-additional-kinds/output.json | 17 ---------- .../yet-another.swift | 2 -- .../Inputs/chained-after/main.swift | 3 -- .../Inputs/chained-after/main.swiftdeps | 2 -- .../Inputs/chained-after/other.swift | 2 -- .../Inputs/chained-after/other.swiftdeps | 2 -- .../Inputs/chained-after/output.json | 17 ---------- .../Inputs/chained-after/yet-another.swift | 2 -- .../chained-after/yet-another.swiftdeps | 2 -- .../main.swift | 4 --- .../main.swiftdeps | 4 --- .../other.swift | 2 -- .../other.swiftdeps | 2 -- .../output.json | 17 ---------- .../yet-another.swift | 2 -- .../yet-another.swiftdeps | 2 -- .../chained-private-after-multiple/main.swift | 3 -- .../main.swiftdeps | 3 -- .../other.swift | 2 -- .../other.swiftdeps | 2 -- .../output.json | 17 ---------- .../yet-another.swift | 2 -- .../yet-another.swiftdeps | 2 -- .../Inputs/chained-private-after/main.swift | 3 -- .../chained-private-after/main.swiftdeps | 3 -- .../Inputs/chained-private-after/other.swift | 2 -- .../chained-private-after/other.swiftdeps | 2 -- .../Inputs/chained-private-after/output.json | 17 ---------- .../chained-private-after/yet-another.swift | 2 -- .../yet-another.swiftdeps | 2 -- .../Inputs/chained-private/main.swift | 3 -- .../Inputs/chained-private/other.swift | 2 -- .../Inputs/chained-private/output.json | 17 ---------- .../Inputs/chained-private/yet-another.swift | 2 -- .../crash-simple-with-swiftdeps/crash.swift | 2 -- .../crash.swiftdeps | 0 .../crash-simple-with-swiftdeps/main.swift | 2 -- .../main.swiftdeps | 0 .../crash-simple-with-swiftdeps/other.swift | 2 -- .../other.swiftdeps | 0 .../crash-simple-with-swiftdeps/output.json | 17 ---------- .../Inputs/crash-simple/crash.swift | 2 -- .../Inputs/crash-simple/main.swift | 2 -- .../Inputs/crash-simple/other.swift | 2 -- .../Inputs/crash-simple/output.json | 17 ---------- .../Inputs/fail-chained/a.swift | 2 -- .../Inputs/fail-chained/b.swift | 2 -- .../Inputs/fail-chained/bad.swift | 3 -- .../Inputs/fail-chained/c.swift | 3 -- .../Inputs/fail-chained/d.swift | 3 -- .../Inputs/fail-chained/e.swift | 3 -- .../Inputs/fail-chained/f.swift | 3 -- .../Inputs/fail-chained/output.json | 33 ------------------- .../Inputs/fail-interface-hash/bad.swift | 3 -- .../Inputs/fail-interface-hash/bad.swiftdeps | 3 -- .../fail-interface-hash/depends-on-bad.swift | 3 -- .../depends-on-bad.swiftdeps | 3 -- .../fail-interface-hash/depends-on-main.swift | 3 -- .../depends-on-main.swiftdeps | 3 -- .../Inputs/fail-interface-hash/main.swift | 3 -- .../Inputs/fail-interface-hash/main.swiftdeps | 3 -- .../Inputs/fail-interface-hash/output.json | 21 ------------ .../Inputs/fail-simple/bad.swift | 2 -- .../Inputs/fail-simple/main.swift | 2 -- .../Inputs/fail-simple/other.swift | 2 -- .../Inputs/fail-simple/output.json | 17 ---------- .../Inputs/fail-with-bad-deps/bad.swift | 4 --- .../Inputs/fail-with-bad-deps/bad.swiftdeps | 3 -- .../fail-with-bad-deps/depends-on-bad.swift | 3 -- .../depends-on-bad.swiftdeps | 3 -- .../fail-with-bad-deps/depends-on-main.swift | 3 -- .../depends-on-main.swiftdeps | 3 -- .../Inputs/fail-with-bad-deps/main.swift | 3 -- .../Inputs/fail-with-bad-deps/main.swiftdeps | 3 -- .../Inputs/fail-with-bad-deps/output.json | 21 ------------ .../Inputs/independent/main.swift | 1 - .../Inputs/independent/other.swift | 1 - .../Inputs/independent/output.json | 13 -------- .../Inputs/malformed-after/main.swift | 2 -- .../Inputs/malformed-after/main.swiftdeps | 2 -- .../Inputs/malformed-after/other.swift | 2 -- .../Inputs/malformed-after/other.swiftdeps | 1 - .../Inputs/malformed-after/output.json | 13 -------- .../malformed-but-valid-yaml/main.swift | 2 -- .../malformed-but-valid-yaml/main.swiftdeps | 2 -- .../malformed-but-valid-yaml/other.swift | 2 -- .../malformed-but-valid-yaml/other.swiftdeps | 1 - .../malformed-but-valid-yaml/output.json | 13 -------- .../mutual-interface-hash/does-change.swift | 4 --- .../does-change.swiftdeps | 4 --- .../does-not-change.swift | 4 --- .../does-not-change.swiftdeps | 4 --- .../Inputs/mutual-interface-hash/output.json | 13 -------- .../Inputs/mutual-with-swiftdeps/main.swift | 3 -- .../mutual-with-swiftdeps/main.swiftdeps | 0 .../Inputs/mutual-with-swiftdeps/other.swift | 3 -- .../mutual-with-swiftdeps/other.swiftdeps | 0 .../Inputs/mutual-with-swiftdeps/output.json | 13 -------- .../Inputs/mutual/main.swift | 3 -- .../Inputs/mutual/other.swift | 3 -- .../Inputs/mutual/output.json | 13 -------- .../Inputs/nominal-members/a-ext.swift | 2 -- .../Inputs/nominal-members/a.swift | 3 -- .../nominal-members/depends-on-a-ext.swift | 3 -- .../nominal-members/depends-on-a-foo.swift | 3 -- .../Inputs/nominal-members/output.json | 21 ------------ .../Inputs/one-way-depends-after/main.swift | 2 -- .../one-way-depends-after/main.swiftdeps | 1 - .../Inputs/one-way-depends-after/other.swift | 2 -- .../one-way-depends-after/other.swiftdeps | 2 -- .../Inputs/one-way-depends-after/output.json | 13 -------- .../Inputs/one-way-depends-before/main.swift | 1 - .../one-way-depends-before/main.swiftdeps | 2 -- .../Inputs/one-way-depends-before/other.swift | 2 -- .../one-way-depends-before/other.swiftdeps | 2 -- .../Inputs/one-way-depends-before/output.json | 13 -------- .../Inputs/one-way-external/main.swift | 3 -- .../Inputs/one-way-external/main1-external | 0 .../Inputs/one-way-external/main2-external | 0 .../Inputs/one-way-external/other.swift | 3 -- .../Inputs/one-way-external/other1-external | 0 .../Inputs/one-way-external/other2-external | 0 .../Inputs/one-way-external/output.json | 13 -------- .../Inputs/one-way-provides-after/main.swift | 2 -- .../one-way-provides-after/main.swiftdeps | 2 -- .../Inputs/one-way-provides-after/other.swift | 2 -- .../one-way-provides-after/other.swiftdeps | 1 - .../Inputs/one-way-provides-after/output.json | 13 -------- .../Inputs/one-way-provides-before/main.swift | 2 -- .../one-way-provides-before/main.swiftdeps | 2 -- .../one-way-provides-before/other.swift | 1 - .../one-way-provides-before/other.swiftdeps | 2 -- .../one-way-provides-before/output.json | 13 -------- .../Inputs/one-way-with-swiftdeps/main.swift | 2 -- .../one-way-with-swiftdeps/main.swiftdeps | 0 .../Inputs/one-way-with-swiftdeps/other.swift | 2 -- .../one-way-with-swiftdeps/other.swiftdeps | 0 .../Inputs/one-way-with-swiftdeps/output.json | 17 ---------- .../Inputs/private-after/a.swift | 2 -- .../Inputs/private-after/a.swiftdeps | 2 -- .../Inputs/private-after/b.swift | 3 -- .../Inputs/private-after/b.swiftdeps | 3 -- .../Inputs/private-after/c.swift | 3 -- .../Inputs/private-after/c.swiftdeps | 3 -- .../Inputs/private-after/d.swift | 3 -- .../Inputs/private-after/d.swiftdeps | 3 -- .../Inputs/private-after/e.swift | 3 -- .../Inputs/private-after/e.swiftdeps | 3 -- .../Inputs/private-after/f.swift | 3 -- .../Inputs/private-after/f.swiftdeps | 3 -- .../Inputs/private-after/g.swift | 3 -- .../Inputs/private-after/g.swiftdeps | 3 -- .../Inputs/private-after/output.json | 33 ------------------- 303 files changed, 1441 deletions(-) delete mode 100644 test/Driver/Dependencies/Inputs/chained-additional-kinds/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-additional-kinds/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-additional-kinds/output.json delete mode 100644 test/Driver/Dependencies/Inputs/chained-additional-kinds/yet-another.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-after/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-after/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-after/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-after/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-after/output.json delete mode 100644 test/Driver/Dependencies/Inputs/chained-after/yet-another.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-after/yet-another.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/output.json delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple/output.json delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple/yet-another.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after-multiple/yet-another.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after/output.json delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after/yet-another.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private-after/yet-another.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/chained-private/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/chained-private/output.json delete mode 100644 test/Driver/Dependencies/Inputs/chained-private/yet-another.swift delete mode 100644 test/Driver/Dependencies/Inputs/crash-simple/crash.swift delete mode 100644 test/Driver/Dependencies/Inputs/crash-simple/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/crash-simple/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/crash-simple/output.json delete mode 100644 test/Driver/Dependencies/Inputs/fail-chained/a.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-chained/b.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-chained/bad.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-chained/c.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-chained/d.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-chained/e.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-chained/f.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-chained/output.json delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/bad.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/bad.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-bad.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-bad.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-main.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/fail-interface-hash/output.json delete mode 100644 test/Driver/Dependencies/Inputs/fail-simple/bad.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-simple/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-simple/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-simple/output.json delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/bad.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/bad.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-bad.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-bad.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-main.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/fail-with-bad-deps/output.json delete mode 100644 test/Driver/Dependencies/Inputs/independent/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/independent/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/independent/output.json delete mode 100644 test/Driver/Dependencies/Inputs/malformed-after/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/malformed-after/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/malformed-after/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/malformed-after/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/malformed-after/output.json delete mode 100644 test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/output.json delete mode 100644 test/Driver/Dependencies/Inputs/mutual-interface-hash/does-change.swift delete mode 100644 test/Driver/Dependencies/Inputs/mutual-interface-hash/does-change.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/mutual-interface-hash/does-not-change.swift delete mode 100644 test/Driver/Dependencies/Inputs/mutual-interface-hash/does-not-change.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/mutual-interface-hash/output.json delete mode 100644 test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/output.json delete mode 100644 test/Driver/Dependencies/Inputs/mutual/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/mutual/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/mutual/output.json delete mode 100644 test/Driver/Dependencies/Inputs/nominal-members/a-ext.swift delete mode 100644 test/Driver/Dependencies/Inputs/nominal-members/a.swift delete mode 100644 test/Driver/Dependencies/Inputs/nominal-members/depends-on-a-ext.swift delete mode 100644 test/Driver/Dependencies/Inputs/nominal-members/depends-on-a-foo.swift delete mode 100644 test/Driver/Dependencies/Inputs/nominal-members/output.json delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-after/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-after/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-after/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-after/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-after/output.json delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-before/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-before/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-before/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-before/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-depends-before/output.json delete mode 100644 test/Driver/Dependencies/Inputs/one-way-external/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-external/main1-external delete mode 100644 test/Driver/Dependencies/Inputs/one-way-external/main2-external delete mode 100644 test/Driver/Dependencies/Inputs/one-way-external/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-external/other1-external delete mode 100644 test/Driver/Dependencies/Inputs/one-way-external/other2-external delete mode 100644 test/Driver/Dependencies/Inputs/one-way-external/output.json delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-after/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-after/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-after/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-after/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-after/output.json delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-before/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-before/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-before/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-before/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-provides-before/output.json delete mode 100644 test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/main.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/main.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/other.swift delete mode 100644 test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/other.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/output.json delete mode 100644 test/Driver/Dependencies/Inputs/private-after/a.swift delete mode 100644 test/Driver/Dependencies/Inputs/private-after/a.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/private-after/b.swift delete mode 100644 test/Driver/Dependencies/Inputs/private-after/b.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/private-after/c.swift delete mode 100644 test/Driver/Dependencies/Inputs/private-after/c.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/private-after/d.swift delete mode 100644 test/Driver/Dependencies/Inputs/private-after/d.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/private-after/e.swift delete mode 100644 test/Driver/Dependencies/Inputs/private-after/e.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/private-after/f.swift delete mode 100644 test/Driver/Dependencies/Inputs/private-after/f.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/private-after/g.swift delete mode 100644 test/Driver/Dependencies/Inputs/private-after/g.swiftdeps delete mode 100644 test/Driver/Dependencies/Inputs/private-after/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/yet-another.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-after/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-after/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-after/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-after/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-after/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-after/yet-another.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-after/yet-another.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/yet-another.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/yet-another.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after/yet-another.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private-after/yet-another.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/chained-private/yet-another.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/crash.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/crash.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple/crash.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/crash-simple/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-chained/a.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-chained/b.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-chained/bad.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-chained/c.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-chained/d.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-chained/e.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-chained/f.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-chained/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/bad.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/bad.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-bad.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-bad.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-interface-hash/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-simple/bad.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-simple/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-simple/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-simple/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/bad.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/bad.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-bad.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-bad.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/independent/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/independent/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/independent/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-after/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-after/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-after/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-after/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-after/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-change.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-change.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-not-change.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-not-change.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/mutual/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/nominal-members/a-ext.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/nominal-members/a.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/nominal-members/depends-on-a-ext.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/nominal-members/depends-on-a-foo.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/nominal-members/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-after/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-after/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-after/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-after/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-after/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-before/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-before/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-before/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-before/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-depends-before/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-external/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-external/main1-external delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-external/main2-external delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-external/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-external/other1-external delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-external/other2-external delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-external/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-after/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-after/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-after/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-after/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-after/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-before/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-before/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-before/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-before/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-provides-before/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/main.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/main.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/other.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/other.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/output.json delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/a.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/a.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/b.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/b.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/c.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/c.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/d.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/d.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/e.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/e.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/f.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/f.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/g.swift delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/g.swiftdeps delete mode 100644 test/Driver/PrivateDependencies/Inputs/private-after/output.json diff --git a/test/Driver/Dependencies/Inputs/chained-additional-kinds/main.swift b/test/Driver/Dependencies/Inputs/chained-additional-kinds/main.swift deleted file mode 100644 index ac74ce9e2fd9a..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-additional-kinds/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-dynamic-lookup: [z] diff --git a/test/Driver/Dependencies/Inputs/chained-additional-kinds/other.swift b/test/Driver/Dependencies/Inputs/chained-additional-kinds/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-additional-kinds/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-additional-kinds/output.json b/test/Driver/Dependencies/Inputs/chained-additional-kinds/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-additional-kinds/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/chained-additional-kinds/yet-another.swift b/test/Driver/Dependencies/Inputs/chained-additional-kinds/yet-another.swift deleted file mode 100644 index 635c9d672b8de..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-additional-kinds/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-dynamic-lookup: [z] diff --git a/test/Driver/Dependencies/Inputs/chained-after/main.swift b/test/Driver/Dependencies/Inputs/chained-after/main.swift deleted file mode 100644 index e0e8f251340b0..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-after/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-nominal: [z] diff --git a/test/Driver/Dependencies/Inputs/chained-after/main.swiftdeps b/test/Driver/Dependencies/Inputs/chained-after/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-after/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-after/other.swift b/test/Driver/Dependencies/Inputs/chained-after/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-after/other.swiftdeps b/test/Driver/Dependencies/Inputs/chained-after/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-after/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-after/output.json b/test/Driver/Dependencies/Inputs/chained-after/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-after/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/chained-after/yet-another.swift b/test/Driver/Dependencies/Inputs/chained-after/yet-another.swift deleted file mode 100644 index 16c64afc2b66a..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-after/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [z] diff --git a/test/Driver/Dependencies/Inputs/chained-after/yet-another.swiftdeps b/test/Driver/Dependencies/Inputs/chained-after/yet-another.swiftdeps deleted file mode 100644 index b52ded789ba00..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-after/yet-another.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [z] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/main.swift b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/main.swift deleted file mode 100644 index 41c4459572e7d..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/main.swift +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [x, a, z] -depends-member: [[x, x], [a, a], [z, z]] -provides-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/main.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/main.swiftdeps deleted file mode 100644 index daf4f75424422..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/main.swiftdeps +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [x, a] -depends-member: [[x, x], !private [a, a]] -provides-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/other.swift b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/other.swift deleted file mode 100644 index 417f71c53c111..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-member: [[a, a]] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/other.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/other.swiftdeps deleted file mode 100644 index 8920d930bbc99..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-member: [[a, a]] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/output.json b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swift b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swift deleted file mode 100644 index f4d83dcc59888..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swiftdeps deleted file mode 100644 index 813bf188859ef..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/main.swift b/test/Driver/Dependencies/Inputs/chained-private-after-multiple/main.swift deleted file mode 100644 index 63f1b24bea3d6..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [x, a, z] -provides-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/main.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple/main.swiftdeps deleted file mode 100644 index 698632a11e988..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [x, !private a] -provides-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/other.swift b/test/Driver/Dependencies/Inputs/chained-private-after-multiple/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/other.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/output.json b/test/Driver/Dependencies/Inputs/chained-private-after-multiple/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/yet-another.swift b/test/Driver/Dependencies/Inputs/chained-private-after-multiple/yet-another.swift deleted file mode 100644 index f4d83dcc59888..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/yet-another.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after-multiple/yet-another.swiftdeps deleted file mode 100644 index 813bf188859ef..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after-multiple/yet-another.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after/main.swift b/test/Driver/Dependencies/Inputs/chained-private-after/main.swift deleted file mode 100644 index f1fd5b5cac497..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after/main.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after/main.swiftdeps deleted file mode 100644 index 90ea1c0103992..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after/main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [!private a] -provides-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after/other.swift b/test/Driver/Dependencies/Inputs/chained-private-after/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after/other.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after/output.json b/test/Driver/Dependencies/Inputs/chained-private-after/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/chained-private-after/yet-another.swift b/test/Driver/Dependencies/Inputs/chained-private-after/yet-another.swift deleted file mode 100644 index f4d83dcc59888..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private-after/yet-another.swiftdeps b/test/Driver/Dependencies/Inputs/chained-private-after/yet-another.swiftdeps deleted file mode 100644 index 813bf188859ef..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private-after/yet-another.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/chained-private/main.swift b/test/Driver/Dependencies/Inputs/chained-private/main.swift deleted file mode 100644 index 840f6e6236ae0..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [!private a] -provides-nominal: [z] diff --git a/test/Driver/Dependencies/Inputs/chained-private/other.swift b/test/Driver/Dependencies/Inputs/chained-private/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/chained-private/output.json b/test/Driver/Dependencies/Inputs/chained-private/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/chained-private/yet-another.swift b/test/Driver/Dependencies/Inputs/chained-private/yet-another.swift deleted file mode 100644 index 16c64afc2b66a..0000000000000 --- a/test/Driver/Dependencies/Inputs/chained-private/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [z] diff --git a/test/Driver/Dependencies/Inputs/crash-simple/crash.swift b/test/Driver/Dependencies/Inputs/crash-simple/crash.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/crash-simple/crash.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/crash-simple/main.swift b/test/Driver/Dependencies/Inputs/crash-simple/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/Dependencies/Inputs/crash-simple/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/crash-simple/other.swift b/test/Driver/Dependencies/Inputs/crash-simple/other.swift deleted file mode 100644 index 33392ce138612..0000000000000 --- a/test/Driver/Dependencies/Inputs/crash-simple/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [!private a] diff --git a/test/Driver/Dependencies/Inputs/crash-simple/output.json b/test/Driver/Dependencies/Inputs/crash-simple/output.json deleted file mode 100644 index 55ef51f19bb04..0000000000000 --- a/test/Driver/Dependencies/Inputs/crash-simple/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./crash.swift": { - "object": "./crash.o", - "swift-dependencies": "./crash.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/fail-chained/a.swift b/test/Driver/Dependencies/Inputs/fail-chained/a.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-chained/a.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/fail-chained/b.swift b/test/Driver/Dependencies/Inputs/fail-chained/b.swift deleted file mode 100644 index d59fcfe0b442f..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-chained/b.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [b] diff --git a/test/Driver/Dependencies/Inputs/fail-chained/bad.swift b/test/Driver/Dependencies/Inputs/fail-chained/bad.swift deleted file mode 100644 index c0840ce567be8..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-chained/bad.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [bad] -depends-top-level: [a, !private b] diff --git a/test/Driver/Dependencies/Inputs/fail-chained/c.swift b/test/Driver/Dependencies/Inputs/fail-chained/c.swift deleted file mode 100644 index d12cec6b055d9..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-chained/c.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [c] -depends-top-level: [bad] diff --git a/test/Driver/Dependencies/Inputs/fail-chained/d.swift b/test/Driver/Dependencies/Inputs/fail-chained/d.swift deleted file mode 100644 index b91fec7759267..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-chained/d.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [d] -depends-top-level: [c] diff --git a/test/Driver/Dependencies/Inputs/fail-chained/e.swift b/test/Driver/Dependencies/Inputs/fail-chained/e.swift deleted file mode 100644 index c0214cc14725b..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-chained/e.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [e] -depends-top-level: [!private bad] diff --git a/test/Driver/Dependencies/Inputs/fail-chained/f.swift b/test/Driver/Dependencies/Inputs/fail-chained/f.swift deleted file mode 100644 index 661c5e0cf4558..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-chained/f.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [f] -depends-top-level: [e] diff --git a/test/Driver/Dependencies/Inputs/fail-chained/output.json b/test/Driver/Dependencies/Inputs/fail-chained/output.json deleted file mode 100644 index 438752aa2616a..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-chained/output.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "./a.swift": { - "object": "./a.o", - "swift-dependencies": "./a.swiftdeps" - }, - "./b.swift": { - "object": "./b.o", - "swift-dependencies": "./b.swiftdeps" - }, - "./c.swift": { - "object": "./c.o", - "swift-dependencies": "./c.swiftdeps" - }, - "./d.swift": { - "object": "./d.o", - "swift-dependencies": "./d.swiftdeps" - }, - "./e.swift": { - "object": "./e.o", - "swift-dependencies": "./e.swiftdeps" - }, - "./f.swift": { - "object": "./f.o", - "swift-dependencies": "./f.swiftdeps" - }, - "./bad.swift": { - "object": "./bad.o", - "swift-dependencies": "./bad.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/bad.swift b/test/Driver/Dependencies/Inputs/fail-interface-hash/bad.swift deleted file mode 100644 index 1da95ae66e8d4..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/bad.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [bad] -interface-hash: "after" diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/bad.swiftdeps b/test/Driver/Dependencies/Inputs/fail-interface-hash/bad.swiftdeps deleted file mode 100644 index 923f6689ba1a5..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/bad.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [bad] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-bad.swift b/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-bad.swift deleted file mode 100644 index 415ec3b051000..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-bad.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [bad] -interface-hash: "after" diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-bad.swiftdeps b/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-bad.swiftdeps deleted file mode 100644 index 97afde93b75ca..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-bad.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [bad] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-main.swift b/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-main.swift deleted file mode 100644 index 2b781b861cb7e..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [main] -interface-hash: "after" diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-main.swiftdeps b/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-main.swiftdeps deleted file mode 100644 index cd50d25b878a7..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/depends-on-main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [main] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/main.swift b/test/Driver/Dependencies/Inputs/fail-interface-hash/main.swift deleted file mode 100644 index 5b5f8d7f3346f..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [main] -interface-hash: "after" diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/main.swiftdeps b/test/Driver/Dependencies/Inputs/fail-interface-hash/main.swiftdeps deleted file mode 100644 index 0ec59e418937a..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [main] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/fail-interface-hash/output.json b/test/Driver/Dependencies/Inputs/fail-interface-hash/output.json deleted file mode 100644 index 981629c77c49e..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-interface-hash/output.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./bad.swift": { - "object": "./bad.o", - "swift-dependencies": "./bad.swiftdeps" - }, - "./depends-on-main.swift": { - "object": "./depends-on-main.o", - "swift-dependencies": "./depends-on-main.swiftdeps" - }, - "./depends-on-bad.swift": { - "object": "./depends-on-bad.o", - "swift-dependencies": "./depends-on-bad.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/fail-simple/bad.swift b/test/Driver/Dependencies/Inputs/fail-simple/bad.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-simple/bad.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/fail-simple/main.swift b/test/Driver/Dependencies/Inputs/fail-simple/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-simple/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/fail-simple/other.swift b/test/Driver/Dependencies/Inputs/fail-simple/other.swift deleted file mode 100644 index 33392ce138612..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-simple/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [!private a] diff --git a/test/Driver/Dependencies/Inputs/fail-simple/output.json b/test/Driver/Dependencies/Inputs/fail-simple/output.json deleted file mode 100644 index 32ad1dd72d6f7..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-simple/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./bad.swift": { - "object": "./bad.o", - "swift-dependencies": "./bad.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/bad.swift b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/bad.swift deleted file mode 100644 index 0f05e70d14710..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/bad.swift +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [bad] -interface-hash: "after" -garbage: "" diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/bad.swiftdeps b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/bad.swiftdeps deleted file mode 100644 index 923f6689ba1a5..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/bad.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [bad] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-bad.swift b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-bad.swift deleted file mode 100644 index 415ec3b051000..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-bad.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [bad] -interface-hash: "after" diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-bad.swiftdeps b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-bad.swiftdeps deleted file mode 100644 index 97afde93b75ca..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-bad.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [bad] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-main.swift b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-main.swift deleted file mode 100644 index 2b781b861cb7e..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [main] -interface-hash: "after" diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-main.swiftdeps b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-main.swiftdeps deleted file mode 100644 index cd50d25b878a7..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/depends-on-main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [main] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/main.swift b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/main.swift deleted file mode 100644 index 5b5f8d7f3346f..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [main] -interface-hash: "after" diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/main.swiftdeps b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/main.swiftdeps deleted file mode 100644 index 0ec59e418937a..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [main] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/output.json b/test/Driver/Dependencies/Inputs/fail-with-bad-deps/output.json deleted file mode 100644 index 981629c77c49e..0000000000000 --- a/test/Driver/Dependencies/Inputs/fail-with-bad-deps/output.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./bad.swift": { - "object": "./bad.o", - "swift-dependencies": "./bad.swiftdeps" - }, - "./depends-on-main.swift": { - "object": "./depends-on-main.o", - "swift-dependencies": "./depends-on-main.swiftdeps" - }, - "./depends-on-bad.swift": { - "object": "./depends-on-bad.o", - "swift-dependencies": "./depends-on-bad.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/independent/main.swift b/test/Driver/Dependencies/Inputs/independent/main.swift deleted file mode 100644 index 133c84747fcc7..0000000000000 --- a/test/Driver/Dependencies/Inputs/independent/main.swift +++ /dev/null @@ -1 +0,0 @@ -# Dependencies after compilation: none diff --git a/test/Driver/Dependencies/Inputs/independent/other.swift b/test/Driver/Dependencies/Inputs/independent/other.swift deleted file mode 100644 index 133c84747fcc7..0000000000000 --- a/test/Driver/Dependencies/Inputs/independent/other.swift +++ /dev/null @@ -1 +0,0 @@ -# Dependencies after compilation: none diff --git a/test/Driver/Dependencies/Inputs/independent/output.json b/test/Driver/Dependencies/Inputs/independent/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/independent/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/malformed-after/main.swift b/test/Driver/Dependencies/Inputs/malformed-after/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-after/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/malformed-after/main.swiftdeps b/test/Driver/Dependencies/Inputs/malformed-after/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-after/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/malformed-after/other.swift b/test/Driver/Dependencies/Inputs/malformed-after/other.swift deleted file mode 100644 index d8b260499b5cf..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -*** This is not a valid YAML file *** diff --git a/test/Driver/Dependencies/Inputs/malformed-after/other.swiftdeps b/test/Driver/Dependencies/Inputs/malformed-after/other.swiftdeps deleted file mode 100644 index 671d72a260df8..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-after/other.swiftdeps +++ /dev/null @@ -1 +0,0 @@ -# Dependencies before compilation: diff --git a/test/Driver/Dependencies/Inputs/malformed-after/output.json b/test/Driver/Dependencies/Inputs/malformed-after/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-after/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/main.swift b/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/main.swiftdeps b/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/other.swift b/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/other.swift deleted file mode 100644 index f9c364551ec7b..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -bogus-entry: [] diff --git a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/other.swiftdeps b/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/other.swiftdeps deleted file mode 100644 index 671d72a260df8..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/other.swiftdeps +++ /dev/null @@ -1 +0,0 @@ -# Dependencies before compilation: diff --git a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/output.json b/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/malformed-but-valid-yaml/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-change.swift b/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-change.swift deleted file mode 100644 index f17cf50119019..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-change.swift +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-top-level: [b] -interface-hash: "after" diff --git a/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-change.swiftdeps b/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-change.swiftdeps deleted file mode 100644 index c03cc687534c2..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-change.swiftdeps +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] -provides-top-level: [b] -interface-hash: "before" diff --git a/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-not-change.swift b/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-not-change.swift deleted file mode 100644 index c585e8096db3e..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-not-change.swift +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [b] -provides-top-level: [a] -interface-hash: "same" diff --git a/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-not-change.swiftdeps b/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-not-change.swiftdeps deleted file mode 100644 index c585e8096db3e..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual-interface-hash/does-not-change.swiftdeps +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [b] -provides-top-level: [a] -interface-hash: "same" diff --git a/test/Driver/Dependencies/Inputs/mutual-interface-hash/output.json b/test/Driver/Dependencies/Inputs/mutual-interface-hash/output.json deleted file mode 100644 index dfbb111fcdce4..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual-interface-hash/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./does-change.swift": { - "object": "./does-change.o", - "swift-dependencies": "./does-change.swiftdeps" - }, - "./does-not-change.swift": { - "object": "./does-not-change.o", - "swift-dependencies": "./does-not-change.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/main.swift b/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/main.swift deleted file mode 100644 index 98f98ba6ec681..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-top-level: [b] diff --git a/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/main.swiftdeps b/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/main.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/other.swift b/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/other.swift deleted file mode 100644 index b6e0280958d77..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/other.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [b] -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/other.swiftdeps b/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/other.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/output.json b/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual-with-swiftdeps/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/mutual/main.swift b/test/Driver/Dependencies/Inputs/mutual/main.swift deleted file mode 100644 index 98f98ba6ec681..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-top-level: [b] diff --git a/test/Driver/Dependencies/Inputs/mutual/other.swift b/test/Driver/Dependencies/Inputs/mutual/other.swift deleted file mode 100644 index b6e0280958d77..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual/other.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [b] -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/mutual/output.json b/test/Driver/Dependencies/Inputs/mutual/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/mutual/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/nominal-members/a-ext.swift b/test/Driver/Dependencies/Inputs/nominal-members/a-ext.swift deleted file mode 100644 index d6babbe4fa788..0000000000000 --- a/test/Driver/Dependencies/Inputs/nominal-members/a-ext.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-member: [[a, "ext"]] diff --git a/test/Driver/Dependencies/Inputs/nominal-members/a.swift b/test/Driver/Dependencies/Inputs/nominal-members/a.swift deleted file mode 100644 index 6ee4213e33e98..0000000000000 --- a/test/Driver/Dependencies/Inputs/nominal-members/a.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [a] -provides-member: [[a, ""]] diff --git a/test/Driver/Dependencies/Inputs/nominal-members/depends-on-a-ext.swift b/test/Driver/Dependencies/Inputs/nominal-members/depends-on-a-ext.swift deleted file mode 100644 index fb570816a6a11..0000000000000 --- a/test/Driver/Dependencies/Inputs/nominal-members/depends-on-a-ext.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-member: [[a, "ext"], [a, ""]] -depends-nominal: [a] diff --git a/test/Driver/Dependencies/Inputs/nominal-members/depends-on-a-foo.swift b/test/Driver/Dependencies/Inputs/nominal-members/depends-on-a-foo.swift deleted file mode 100644 index 5455f16e4e9a2..0000000000000 --- a/test/Driver/Dependencies/Inputs/nominal-members/depends-on-a-foo.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-member: [[a, "foo"], [a, ""]] -depends-nominal: [a] diff --git a/test/Driver/Dependencies/Inputs/nominal-members/output.json b/test/Driver/Dependencies/Inputs/nominal-members/output.json deleted file mode 100644 index d4d6d49c54405..0000000000000 --- a/test/Driver/Dependencies/Inputs/nominal-members/output.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "./a.swift": { - "object": "./a.o", - "swift-dependencies": "./a.swiftdeps" - }, - "./a-ext.swift": { - "object": "./a-ext.o", - "swift-dependencies": "./a-ext.swiftdeps" - }, - "./depends-on-a-ext.swift": { - "object": "./depends-on-a-ext.o", - "swift-dependencies": "./depends-on-a-ext.swiftdeps" - }, - "./depends-on-a-foo.swift": { - "object": "./depends-on-a-foo.o", - "swift-dependencies": "./depends-on-a-foo.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-after/main.swift b/test/Driver/Dependencies/Inputs/one-way-depends-after/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-after/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-after/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-depends-after/main.swiftdeps deleted file mode 100644 index 671d72a260df8..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-after/main.swiftdeps +++ /dev/null @@ -1 +0,0 @@ -# Dependencies before compilation: diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-after/other.swift b/test/Driver/Dependencies/Inputs/one-way-depends-after/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-after/other.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-depends-after/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-after/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-after/output.json b/test/Driver/Dependencies/Inputs/one-way-depends-after/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-after/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-before/main.swift b/test/Driver/Dependencies/Inputs/one-way-depends-before/main.swift deleted file mode 100644 index d281641607776..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-before/main.swift +++ /dev/null @@ -1 +0,0 @@ -# Dependencies after compilation: diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-before/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-depends-before/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-before/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-before/other.swift b/test/Driver/Dependencies/Inputs/one-way-depends-before/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-before/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-before/other.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-depends-before/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-before/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-depends-before/output.json b/test/Driver/Dependencies/Inputs/one-way-depends-before/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-depends-before/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/one-way-external/main.swift b/test/Driver/Dependencies/Inputs/one-way-external/main.swift deleted file mode 100644 index de7b922b068b8..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-external/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -depends-external: ["./main1-external", "./main2-external"] diff --git a/test/Driver/Dependencies/Inputs/one-way-external/main1-external b/test/Driver/Dependencies/Inputs/one-way-external/main1-external deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/Dependencies/Inputs/one-way-external/main2-external b/test/Driver/Dependencies/Inputs/one-way-external/main2-external deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/Dependencies/Inputs/one-way-external/other.swift b/test/Driver/Dependencies/Inputs/one-way-external/other.swift deleted file mode 100644 index fd31229634def..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-external/other.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] -depends-external: ["./other1-external", "./other2-external"] diff --git a/test/Driver/Dependencies/Inputs/one-way-external/other1-external b/test/Driver/Dependencies/Inputs/one-way-external/other1-external deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/Dependencies/Inputs/one-way-external/other2-external b/test/Driver/Dependencies/Inputs/one-way-external/other2-external deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/Dependencies/Inputs/one-way-external/output.json b/test/Driver/Dependencies/Inputs/one-way-external/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-external/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-after/main.swift b/test/Driver/Dependencies/Inputs/one-way-provides-after/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-after/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-after/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-provides-after/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-after/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-after/other.swift b/test/Driver/Dependencies/Inputs/one-way-provides-after/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-after/other.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-provides-after/other.swiftdeps deleted file mode 100644 index 671d72a260df8..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-after/other.swiftdeps +++ /dev/null @@ -1 +0,0 @@ -# Dependencies before compilation: diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-after/output.json b/test/Driver/Dependencies/Inputs/one-way-provides-after/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-after/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-before/main.swift b/test/Driver/Dependencies/Inputs/one-way-provides-before/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-before/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-before/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-provides-before/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-before/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-before/other.swift b/test/Driver/Dependencies/Inputs/one-way-provides-before/other.swift deleted file mode 100644 index 133c84747fcc7..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-before/other.swift +++ /dev/null @@ -1 +0,0 @@ -# Dependencies after compilation: none diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-before/other.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-provides-before/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-before/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-provides-before/output.json b/test/Driver/Dependencies/Inputs/one-way-provides-before/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-provides-before/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/main.swift b/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/main.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/main.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/other.swift b/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/other.swiftdeps b/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/other.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/output.json b/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/output.json deleted file mode 100644 index f2eb4d2dddbeb..0000000000000 --- a/test/Driver/Dependencies/Inputs/one-way-with-swiftdeps/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps", - "swiftmodule": "./main.swiftmodule", - "swiftdoc": "./main.swiftdoc", - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps", - "swiftmodule": "./main.swiftmodule", - "swiftdoc": "./main.swiftdoc", - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/Dependencies/Inputs/private-after/a.swift b/test/Driver/Dependencies/Inputs/private-after/a.swift deleted file mode 100644 index 76fb34c551d66..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/a.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [a] diff --git a/test/Driver/Dependencies/Inputs/private-after/a.swiftdeps b/test/Driver/Dependencies/Inputs/private-after/a.swiftdeps deleted file mode 100644 index bdaa467ec3944..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/a.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [a] diff --git a/test/Driver/Dependencies/Inputs/private-after/b.swift b/test/Driver/Dependencies/Inputs/private-after/b.swift deleted file mode 100644 index c1c455e32fbc9..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/b.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [b] -depends-nominal: [!private a, e] diff --git a/test/Driver/Dependencies/Inputs/private-after/b.swiftdeps b/test/Driver/Dependencies/Inputs/private-after/b.swiftdeps deleted file mode 100644 index af1427f6a149a..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/b.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [b] -depends-nominal: [!private a, e] diff --git a/test/Driver/Dependencies/Inputs/private-after/c.swift b/test/Driver/Dependencies/Inputs/private-after/c.swift deleted file mode 100644 index b5a1c6a68b3da..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/c.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [c] -depends-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/private-after/c.swiftdeps b/test/Driver/Dependencies/Inputs/private-after/c.swiftdeps deleted file mode 100644 index 2a25e2c419b0a..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/c.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [c] -depends-nominal: [b] diff --git a/test/Driver/Dependencies/Inputs/private-after/d.swift b/test/Driver/Dependencies/Inputs/private-after/d.swift deleted file mode 100644 index 2fbb8a2590de2..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/d.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [d] -depends-nominal: [a] diff --git a/test/Driver/Dependencies/Inputs/private-after/d.swiftdeps b/test/Driver/Dependencies/Inputs/private-after/d.swiftdeps deleted file mode 100644 index 2928bc43a566f..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/d.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [] -depends-nominal: [a] diff --git a/test/Driver/Dependencies/Inputs/private-after/e.swift b/test/Driver/Dependencies/Inputs/private-after/e.swift deleted file mode 100644 index 452c171d41792..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/e.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [e] -depends-nominal: [d] diff --git a/test/Driver/Dependencies/Inputs/private-after/e.swiftdeps b/test/Driver/Dependencies/Inputs/private-after/e.swiftdeps deleted file mode 100644 index def0f31b858c0..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/e.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [] -depends-nominal: [d] diff --git a/test/Driver/Dependencies/Inputs/private-after/f.swift b/test/Driver/Dependencies/Inputs/private-after/f.swift deleted file mode 100644 index 25d3cd0b35243..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/f.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [f] -depends-nominal: [!private e] diff --git a/test/Driver/Dependencies/Inputs/private-after/f.swiftdeps b/test/Driver/Dependencies/Inputs/private-after/f.swiftdeps deleted file mode 100644 index 6021e8d68af3d..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/f.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [f] -depends-nominal: [!private e] diff --git a/test/Driver/Dependencies/Inputs/private-after/g.swift b/test/Driver/Dependencies/Inputs/private-after/g.swift deleted file mode 100644 index 41e5867827600..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/g.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [g] -depends-nominal: [f] diff --git a/test/Driver/Dependencies/Inputs/private-after/g.swiftdeps b/test/Driver/Dependencies/Inputs/private-after/g.swiftdeps deleted file mode 100644 index ab44b478e1fba..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/g.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [g] -depends-nominal: [f] diff --git a/test/Driver/Dependencies/Inputs/private-after/output.json b/test/Driver/Dependencies/Inputs/private-after/output.json deleted file mode 100644 index c15439d5780e4..0000000000000 --- a/test/Driver/Dependencies/Inputs/private-after/output.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "./a.swift": { - "object": "./a.o", - "swift-dependencies": "./a.swiftdeps" - }, - "./b.swift": { - "object": "./b.o", - "swift-dependencies": "./b.swiftdeps" - }, - "./c.swift": { - "object": "./c.o", - "swift-dependencies": "./c.swiftdeps" - }, - "./d.swift": { - "object": "./d.o", - "swift-dependencies": "./d.swiftdeps" - }, - "./e.swift": { - "object": "./e.o", - "swift-dependencies": "./e.swiftdeps" - }, - "./f.swift": { - "object": "./f.o", - "swift-dependencies": "./f.swiftdeps" - }, - "./g.swift": { - "object": "./g.o", - "swift-dependencies": "./g.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/main.swift b/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/main.swift deleted file mode 100644 index ac74ce9e2fd9a..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-dynamic-lookup: [z] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/other.swift b/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/output.json b/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/yet-another.swift b/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/yet-another.swift deleted file mode 100644 index 635c9d672b8de..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-additional-kinds/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-dynamic-lookup: [z] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after/main.swift b/test/Driver/PrivateDependencies/Inputs/chained-after/main.swift deleted file mode 100644 index e0e8f251340b0..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-after/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-nominal: [z] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-after/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-after/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after/other.swift b/test/Driver/PrivateDependencies/Inputs/chained-after/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-after/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-after/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after/output.json b/test/Driver/PrivateDependencies/Inputs/chained-after/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-after/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after/yet-another.swift b/test/Driver/PrivateDependencies/Inputs/chained-after/yet-another.swift deleted file mode 100644 index 16c64afc2b66a..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-after/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [z] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-after/yet-another.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-after/yet-another.swiftdeps deleted file mode 100644 index b52ded789ba00..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-after/yet-another.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [z] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/main.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/main.swift deleted file mode 100644 index 41c4459572e7d..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/main.swift +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [x, a, z] -depends-member: [[x, x], [a, a], [z, z]] -provides-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/main.swiftdeps deleted file mode 100644 index daf4f75424422..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/main.swiftdeps +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [x, a] -depends-member: [[x, x], !private [a, a]] -provides-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/other.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/other.swift deleted file mode 100644 index 417f71c53c111..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-member: [[a, a]] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/other.swiftdeps deleted file mode 100644 index 8920d930bbc99..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-member: [[a, a]] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/output.json b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swift deleted file mode 100644 index f4d83dcc59888..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swiftdeps deleted file mode 100644 index 813bf188859ef..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple-nominal-members/yet-another.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/main.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/main.swift deleted file mode 100644 index 63f1b24bea3d6..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [x, a, z] -provides-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/main.swiftdeps deleted file mode 100644 index 698632a11e988..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [x, !private a] -provides-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/other.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/output.json b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/yet-another.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/yet-another.swift deleted file mode 100644 index f4d83dcc59888..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/yet-another.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/yet-another.swiftdeps deleted file mode 100644 index 813bf188859ef..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after-multiple/yet-another.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after/main.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after/main.swift deleted file mode 100644 index f1fd5b5cac497..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after/main.swiftdeps deleted file mode 100644 index 90ea1c0103992..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after/main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [!private a] -provides-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after/other.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after/output.json b/test/Driver/PrivateDependencies/Inputs/chained-private-after/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after/yet-another.swift b/test/Driver/PrivateDependencies/Inputs/chained-private-after/yet-another.swift deleted file mode 100644 index f4d83dcc59888..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private-after/yet-another.swiftdeps b/test/Driver/PrivateDependencies/Inputs/chained-private-after/yet-another.swiftdeps deleted file mode 100644 index 813bf188859ef..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private-after/yet-another.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private/main.swift b/test/Driver/PrivateDependencies/Inputs/chained-private/main.swift deleted file mode 100644 index 840f6e6236ae0..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [!private a] -provides-nominal: [z] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private/other.swift b/test/Driver/PrivateDependencies/Inputs/chained-private/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private/output.json b/test/Driver/PrivateDependencies/Inputs/chained-private/output.json deleted file mode 100644 index 78134f1ab01d1..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "./yet-another.swift": { - "object": "./yet-another.o", - "swift-dependencies": "./yet-another.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/chained-private/yet-another.swift b/test/Driver/PrivateDependencies/Inputs/chained-private/yet-another.swift deleted file mode 100644 index 16c64afc2b66a..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/chained-private/yet-another.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-nominal: [z] diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/crash.swift b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/crash.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/crash.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/crash.swiftdeps b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/crash.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/main.swift b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/main.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/other.swift b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/other.swift deleted file mode 100644 index 33392ce138612..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [!private a] diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/other.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/output.json b/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/output.json deleted file mode 100644 index 55ef51f19bb04..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/crash-simple-with-swiftdeps/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./crash.swift": { - "object": "./crash.o", - "swift-dependencies": "./crash.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple/crash.swift b/test/Driver/PrivateDependencies/Inputs/crash-simple/crash.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/crash-simple/crash.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple/main.swift b/test/Driver/PrivateDependencies/Inputs/crash-simple/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/crash-simple/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple/other.swift b/test/Driver/PrivateDependencies/Inputs/crash-simple/other.swift deleted file mode 100644 index 33392ce138612..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/crash-simple/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [!private a] diff --git a/test/Driver/PrivateDependencies/Inputs/crash-simple/output.json b/test/Driver/PrivateDependencies/Inputs/crash-simple/output.json deleted file mode 100644 index 55ef51f19bb04..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/crash-simple/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./crash.swift": { - "object": "./crash.o", - "swift-dependencies": "./crash.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/fail-chained/a.swift b/test/Driver/PrivateDependencies/Inputs/fail-chained/a.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-chained/a.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-chained/b.swift b/test/Driver/PrivateDependencies/Inputs/fail-chained/b.swift deleted file mode 100644 index d59fcfe0b442f..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-chained/b.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-chained/bad.swift b/test/Driver/PrivateDependencies/Inputs/fail-chained/bad.swift deleted file mode 100644 index c0840ce567be8..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-chained/bad.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [bad] -depends-top-level: [a, !private b] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-chained/c.swift b/test/Driver/PrivateDependencies/Inputs/fail-chained/c.swift deleted file mode 100644 index d12cec6b055d9..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-chained/c.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [c] -depends-top-level: [bad] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-chained/d.swift b/test/Driver/PrivateDependencies/Inputs/fail-chained/d.swift deleted file mode 100644 index b91fec7759267..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-chained/d.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [d] -depends-top-level: [c] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-chained/e.swift b/test/Driver/PrivateDependencies/Inputs/fail-chained/e.swift deleted file mode 100644 index c0214cc14725b..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-chained/e.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [e] -depends-top-level: [!private bad] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-chained/f.swift b/test/Driver/PrivateDependencies/Inputs/fail-chained/f.swift deleted file mode 100644 index 661c5e0cf4558..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-chained/f.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [f] -depends-top-level: [e] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-chained/output.json b/test/Driver/PrivateDependencies/Inputs/fail-chained/output.json deleted file mode 100644 index 438752aa2616a..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-chained/output.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "./a.swift": { - "object": "./a.o", - "swift-dependencies": "./a.swiftdeps" - }, - "./b.swift": { - "object": "./b.o", - "swift-dependencies": "./b.swiftdeps" - }, - "./c.swift": { - "object": "./c.o", - "swift-dependencies": "./c.swiftdeps" - }, - "./d.swift": { - "object": "./d.o", - "swift-dependencies": "./d.swiftdeps" - }, - "./e.swift": { - "object": "./e.o", - "swift-dependencies": "./e.swiftdeps" - }, - "./f.swift": { - "object": "./f.o", - "swift-dependencies": "./f.swiftdeps" - }, - "./bad.swift": { - "object": "./bad.o", - "swift-dependencies": "./bad.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/bad.swift b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/bad.swift deleted file mode 100644 index 1da95ae66e8d4..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/bad.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [bad] -interface-hash: "after" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/bad.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/bad.swiftdeps deleted file mode 100644 index 923f6689ba1a5..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/bad.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [bad] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-bad.swift b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-bad.swift deleted file mode 100644 index 415ec3b051000..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-bad.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [bad] -interface-hash: "after" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-bad.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-bad.swiftdeps deleted file mode 100644 index 97afde93b75ca..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-bad.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [bad] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-main.swift b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-main.swift deleted file mode 100644 index 2b781b861cb7e..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [main] -interface-hash: "after" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-main.swiftdeps deleted file mode 100644 index cd50d25b878a7..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/depends-on-main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [main] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/main.swift b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/main.swift deleted file mode 100644 index 5b5f8d7f3346f..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [main] -interface-hash: "after" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/main.swiftdeps deleted file mode 100644 index 0ec59e418937a..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [main] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/output.json b/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/output.json deleted file mode 100644 index 981629c77c49e..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-interface-hash/output.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./bad.swift": { - "object": "./bad.o", - "swift-dependencies": "./bad.swiftdeps" - }, - "./depends-on-main.swift": { - "object": "./depends-on-main.o", - "swift-dependencies": "./depends-on-main.swiftdeps" - }, - "./depends-on-bad.swift": { - "object": "./depends-on-bad.o", - "swift-dependencies": "./depends-on-bad.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/fail-simple/bad.swift b/test/Driver/PrivateDependencies/Inputs/fail-simple/bad.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-simple/bad.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-simple/main.swift b/test/Driver/PrivateDependencies/Inputs/fail-simple/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-simple/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-simple/other.swift b/test/Driver/PrivateDependencies/Inputs/fail-simple/other.swift deleted file mode 100644 index 33392ce138612..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-simple/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [!private a] diff --git a/test/Driver/PrivateDependencies/Inputs/fail-simple/output.json b/test/Driver/PrivateDependencies/Inputs/fail-simple/output.json deleted file mode 100644 index 32ad1dd72d6f7..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-simple/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./bad.swift": { - "object": "./bad.o", - "swift-dependencies": "./bad.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/bad.swift b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/bad.swift deleted file mode 100644 index 0f05e70d14710..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/bad.swift +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [bad] -interface-hash: "after" -garbage: "" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/bad.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/bad.swiftdeps deleted file mode 100644 index 923f6689ba1a5..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/bad.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [bad] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-bad.swift b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-bad.swift deleted file mode 100644 index 415ec3b051000..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-bad.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [bad] -interface-hash: "after" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-bad.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-bad.swiftdeps deleted file mode 100644 index 97afde93b75ca..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-bad.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [bad] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-main.swift b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-main.swift deleted file mode 100644 index 2b781b861cb7e..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [main] -interface-hash: "after" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-main.swiftdeps deleted file mode 100644 index cd50d25b878a7..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/depends-on-main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [main] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/main.swift b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/main.swift deleted file mode 100644 index 5b5f8d7f3346f..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [main] -interface-hash: "after" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/main.swiftdeps deleted file mode 100644 index 0ec59e418937a..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/main.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [main] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/output.json b/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/output.json deleted file mode 100644 index 981629c77c49e..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/fail-with-bad-deps/output.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./bad.swift": { - "object": "./bad.o", - "swift-dependencies": "./bad.swiftdeps" - }, - "./depends-on-main.swift": { - "object": "./depends-on-main.o", - "swift-dependencies": "./depends-on-main.swiftdeps" - }, - "./depends-on-bad.swift": { - "object": "./depends-on-bad.o", - "swift-dependencies": "./depends-on-bad.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/independent/main.swift b/test/Driver/PrivateDependencies/Inputs/independent/main.swift deleted file mode 100644 index 133c84747fcc7..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/independent/main.swift +++ /dev/null @@ -1 +0,0 @@ -# Dependencies after compilation: none diff --git a/test/Driver/PrivateDependencies/Inputs/independent/other.swift b/test/Driver/PrivateDependencies/Inputs/independent/other.swift deleted file mode 100644 index 133c84747fcc7..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/independent/other.swift +++ /dev/null @@ -1 +0,0 @@ -# Dependencies after compilation: none diff --git a/test/Driver/PrivateDependencies/Inputs/independent/output.json b/test/Driver/PrivateDependencies/Inputs/independent/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/independent/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-after/main.swift b/test/Driver/PrivateDependencies/Inputs/malformed-after/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-after/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-after/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/malformed-after/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-after/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-after/other.swift b/test/Driver/PrivateDependencies/Inputs/malformed-after/other.swift deleted file mode 100644 index d8b260499b5cf..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -*** This is not a valid YAML file *** diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-after/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/malformed-after/other.swiftdeps deleted file mode 100644 index 671d72a260df8..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-after/other.swiftdeps +++ /dev/null @@ -1 +0,0 @@ -# Dependencies before compilation: diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-after/output.json b/test/Driver/PrivateDependencies/Inputs/malformed-after/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-after/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/main.swift b/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/other.swift b/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/other.swift deleted file mode 100644 index f9c364551ec7b..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -bogus-entry: [] diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/other.swiftdeps deleted file mode 100644 index 671d72a260df8..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/other.swiftdeps +++ /dev/null @@ -1 +0,0 @@ -# Dependencies before compilation: diff --git a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/output.json b/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/malformed-but-valid-yaml/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-change.swift b/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-change.swift deleted file mode 100644 index f17cf50119019..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-change.swift +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-top-level: [b] -interface-hash: "after" diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-change.swiftdeps b/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-change.swiftdeps deleted file mode 100644 index c03cc687534c2..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-change.swiftdeps +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] -provides-top-level: [b] -interface-hash: "before" diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-not-change.swift b/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-not-change.swift deleted file mode 100644 index c585e8096db3e..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-not-change.swift +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [b] -provides-top-level: [a] -interface-hash: "same" diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-not-change.swiftdeps b/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-not-change.swiftdeps deleted file mode 100644 index c585e8096db3e..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/does-not-change.swiftdeps +++ /dev/null @@ -1,4 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [b] -provides-top-level: [a] -interface-hash: "same" diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/output.json b/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/output.json deleted file mode 100644 index dfbb111fcdce4..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual-interface-hash/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./does-change.swift": { - "object": "./does-change.o", - "swift-dependencies": "./does-change.swiftdeps" - }, - "./does-not-change.swift": { - "object": "./does-not-change.o", - "swift-dependencies": "./does-not-change.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/main.swift b/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/main.swift deleted file mode 100644 index 98f98ba6ec681..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-top-level: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/main.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/other.swift b/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/other.swift deleted file mode 100644 index b6e0280958d77..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/other.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [b] -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/other.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/output.json b/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual-with-swiftdeps/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/mutual/main.swift b/test/Driver/PrivateDependencies/Inputs/mutual/main.swift deleted file mode 100644 index 98f98ba6ec681..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -provides-top-level: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/mutual/other.swift b/test/Driver/PrivateDependencies/Inputs/mutual/other.swift deleted file mode 100644 index b6e0280958d77..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual/other.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [b] -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/mutual/output.json b/test/Driver/PrivateDependencies/Inputs/mutual/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/mutual/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/nominal-members/a-ext.swift b/test/Driver/PrivateDependencies/Inputs/nominal-members/a-ext.swift deleted file mode 100644 index d6babbe4fa788..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/nominal-members/a-ext.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-member: [[a, "ext"]] diff --git a/test/Driver/PrivateDependencies/Inputs/nominal-members/a.swift b/test/Driver/PrivateDependencies/Inputs/nominal-members/a.swift deleted file mode 100644 index 6ee4213e33e98..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/nominal-members/a.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [a] -provides-member: [[a, ""]] diff --git a/test/Driver/PrivateDependencies/Inputs/nominal-members/depends-on-a-ext.swift b/test/Driver/PrivateDependencies/Inputs/nominal-members/depends-on-a-ext.swift deleted file mode 100644 index fb570816a6a11..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/nominal-members/depends-on-a-ext.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-member: [[a, "ext"], [a, ""]] -depends-nominal: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/nominal-members/depends-on-a-foo.swift b/test/Driver/PrivateDependencies/Inputs/nominal-members/depends-on-a-foo.swift deleted file mode 100644 index 5455f16e4e9a2..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/nominal-members/depends-on-a-foo.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-member: [[a, "foo"], [a, ""]] -depends-nominal: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/nominal-members/output.json b/test/Driver/PrivateDependencies/Inputs/nominal-members/output.json deleted file mode 100644 index d4d6d49c54405..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/nominal-members/output.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "./a.swift": { - "object": "./a.o", - "swift-dependencies": "./a.swiftdeps" - }, - "./a-ext.swift": { - "object": "./a-ext.o", - "swift-dependencies": "./a-ext.swiftdeps" - }, - "./depends-on-a-ext.swift": { - "object": "./depends-on-a-ext.o", - "swift-dependencies": "./depends-on-a-ext.swiftdeps" - }, - "./depends-on-a-foo.swift": { - "object": "./depends-on-a-foo.o", - "swift-dependencies": "./depends-on-a-foo.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/main.swift b/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/main.swiftdeps deleted file mode 100644 index 671d72a260df8..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/main.swiftdeps +++ /dev/null @@ -1 +0,0 @@ -# Dependencies before compilation: diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/other.swift b/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/output.json b/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-after/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/main.swift b/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/main.swift deleted file mode 100644 index d281641607776..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/main.swift +++ /dev/null @@ -1 +0,0 @@ -# Dependencies after compilation: diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/other.swift b/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/output.json b/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-depends-before/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-external/main.swift b/test/Driver/PrivateDependencies/Inputs/one-way-external/main.swift deleted file mode 100644 index de7b922b068b8..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-external/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] -depends-external: ["./main1-external", "./main2-external"] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-external/main1-external b/test/Driver/PrivateDependencies/Inputs/one-way-external/main1-external deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-external/main2-external b/test/Driver/PrivateDependencies/Inputs/one-way-external/main2-external deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-external/other.swift b/test/Driver/PrivateDependencies/Inputs/one-way-external/other.swift deleted file mode 100644 index fd31229634def..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-external/other.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] -depends-external: ["./other1-external", "./other2-external"] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-external/other1-external b/test/Driver/PrivateDependencies/Inputs/one-way-external/other1-external deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-external/other2-external b/test/Driver/PrivateDependencies/Inputs/one-way-external/other2-external deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-external/output.json b/test/Driver/PrivateDependencies/Inputs/one-way-external/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-external/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/main.swift b/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/other.swift b/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/other.swiftdeps deleted file mode 100644 index 671d72a260df8..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/other.swiftdeps +++ /dev/null @@ -1 +0,0 @@ -# Dependencies before compilation: diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/output.json b/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-after/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/main.swift b/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/main.swiftdeps deleted file mode 100644 index af39a9cad8a70..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/main.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/other.swift b/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/other.swift deleted file mode 100644 index 133c84747fcc7..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/other.swift +++ /dev/null @@ -1 +0,0 @@ -# Dependencies after compilation: none diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/other.swiftdeps deleted file mode 100644 index 37adc17c77e7c..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/other.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/output.json b/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/output.json deleted file mode 100644 index f847af2da52ff..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-provides-before/output.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps" - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/main.swift b/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/main.swift deleted file mode 100644 index c6dd8d475b207..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -depends-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/main.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/main.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/other.swift b/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/other.swift deleted file mode 100644 index 7e7daa298c540..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/other.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-top-level: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/other.swiftdeps b/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/other.swiftdeps deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/output.json b/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/output.json deleted file mode 100644 index f2eb4d2dddbeb..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/one-way-with-swiftdeps/output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "./main.swift": { - "object": "./main.o", - "swift-dependencies": "./main.swiftdeps", - "swiftmodule": "./main.swiftmodule", - "swiftdoc": "./main.swiftdoc", - }, - "./other.swift": { - "object": "./other.o", - "swift-dependencies": "./other.swiftdeps", - "swiftmodule": "./main.swiftmodule", - "swiftdoc": "./main.swiftdoc", - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/a.swift b/test/Driver/PrivateDependencies/Inputs/private-after/a.swift deleted file mode 100644 index 76fb34c551d66..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/a.swift +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/a.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after/a.swiftdeps deleted file mode 100644 index bdaa467ec3944..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/a.swiftdeps +++ /dev/null @@ -1,2 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/b.swift b/test/Driver/PrivateDependencies/Inputs/private-after/b.swift deleted file mode 100644 index c1c455e32fbc9..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/b.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [b] -depends-nominal: [!private a, e] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/b.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after/b.swiftdeps deleted file mode 100644 index af1427f6a149a..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/b.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [b] -depends-nominal: [!private a, e] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/c.swift b/test/Driver/PrivateDependencies/Inputs/private-after/c.swift deleted file mode 100644 index b5a1c6a68b3da..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/c.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [c] -depends-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/c.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after/c.swiftdeps deleted file mode 100644 index 2a25e2c419b0a..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/c.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [c] -depends-nominal: [b] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/d.swift b/test/Driver/PrivateDependencies/Inputs/private-after/d.swift deleted file mode 100644 index 2fbb8a2590de2..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/d.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [d] -depends-nominal: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/d.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after/d.swiftdeps deleted file mode 100644 index 2928bc43a566f..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/d.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [] -depends-nominal: [a] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/e.swift b/test/Driver/PrivateDependencies/Inputs/private-after/e.swift deleted file mode 100644 index 452c171d41792..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/e.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [e] -depends-nominal: [d] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/e.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after/e.swiftdeps deleted file mode 100644 index def0f31b858c0..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/e.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [] -depends-nominal: [d] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/f.swift b/test/Driver/PrivateDependencies/Inputs/private-after/f.swift deleted file mode 100644 index 25d3cd0b35243..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/f.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [f] -depends-nominal: [!private e] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/f.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after/f.swiftdeps deleted file mode 100644 index 6021e8d68af3d..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/f.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [f] -depends-nominal: [!private e] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/g.swift b/test/Driver/PrivateDependencies/Inputs/private-after/g.swift deleted file mode 100644 index 41e5867827600..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/g.swift +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies after compilation: -provides-nominal: [g] -depends-nominal: [f] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/g.swiftdeps b/test/Driver/PrivateDependencies/Inputs/private-after/g.swiftdeps deleted file mode 100644 index ab44b478e1fba..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/g.swiftdeps +++ /dev/null @@ -1,3 +0,0 @@ -# Dependencies before compilation: -provides-nominal: [g] -depends-nominal: [f] diff --git a/test/Driver/PrivateDependencies/Inputs/private-after/output.json b/test/Driver/PrivateDependencies/Inputs/private-after/output.json deleted file mode 100644 index c15439d5780e4..0000000000000 --- a/test/Driver/PrivateDependencies/Inputs/private-after/output.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "./a.swift": { - "object": "./a.o", - "swift-dependencies": "./a.swiftdeps" - }, - "./b.swift": { - "object": "./b.o", - "swift-dependencies": "./b.swiftdeps" - }, - "./c.swift": { - "object": "./c.o", - "swift-dependencies": "./c.swiftdeps" - }, - "./d.swift": { - "object": "./d.o", - "swift-dependencies": "./d.swiftdeps" - }, - "./e.swift": { - "object": "./e.o", - "swift-dependencies": "./e.swiftdeps" - }, - "./f.swift": { - "object": "./f.o", - "swift-dependencies": "./f.swiftdeps" - }, - "./g.swift": { - "object": "./g.o", - "swift-dependencies": "./g.swiftdeps" - }, - "": { - "swift-dependencies": "./main~buildrecord.swiftdeps" - } -} From b873fe214edf1cf0e6bd1ea82e8a7d09ba7cc4a4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 10 Jun 2020 19:55:56 -0400 Subject: [PATCH 8/8] Code review feedback from Dave Ungar --- .../swift/AST/FineGrainedDependencyFormat.h | 53 ++++++++++++++----- lib/AST/FineGrainedDependencies.cpp | 20 ++----- lib/AST/FineGrainedDependencyFormat.cpp | 4 ++ lib/AST/FrontendSourceFileDepGraphFactory.cpp | 13 +---- 4 files changed, 50 insertions(+), 40 deletions(-) diff --git a/include/swift/AST/FineGrainedDependencyFormat.h b/include/swift/AST/FineGrainedDependencyFormat.h index c514a5217c75f..a4d35695ceebb 100644 --- a/include/swift/AST/FineGrainedDependencyFormat.h +++ b/include/swift/AST/FineGrainedDependencyFormat.h @@ -33,6 +33,8 @@ using llvm::BCVBR; using llvm::BCBlob; using llvm::BCRecordLayout; +/// Every .swiftdeps file begins with these 4 bytes, for easy identification when +/// debugging. const unsigned char FINE_GRAINED_DEPDENENCY_FORMAT_SIGNATURE[] = {'D', 'E', 'P', 'S'}; const unsigned FINE_GRAINED_DEPENDENCY_FORMAT_VERSION_MAJOR = 1; @@ -47,6 +49,13 @@ using DeclAspectField = BCFixed<1>; const unsigned RECORD_BLOCK_ID = llvm::bitc::FIRST_APPLICATION_BLOCKID; +/// The swiftdeps file format consists of a METADATA record, followed by zero or more +/// IDENTIFIER_NODE records. +/// +/// Then, there is one SOURCE_FILE_DEP_GRAPH_NODE for each serialized +/// SourceFileDepGraphNode. These are followed by FINGERPRINT_NODE and +/// DEPENDS_ON_DEFINITION_NODE, if the node has a fingerprint and depends-on +/// definitions, respectively. namespace record_block { enum { METADATA = 1, @@ -56,6 +65,7 @@ namespace record_block { IDENTIFIER_NODE, }; + // Always the first record in the file. using MetadataLayout = BCRecordLayout< METADATA, // ID BCFixed<16>, // Dependency graph format major version @@ -63,40 +73,57 @@ namespace record_block { BCBlob // Compiler version string >; + // After the metadata record, we have zero or more identifier records, + // for each unique string that is referenced from a SourceFileDepGraphNode. + // + // Identifiers are referenced by their sequence number, starting from 1. + // The identifier value 0 is special; it always represents the empty string. + // There is no IDENTIFIER_NODE serialized that corresponds to it, instead + // the first IDENTIFIER_NODE always has a sequence number of 1. + using IdentifierNodeLayout = BCRecordLayout< + IDENTIFIER_NODE, + BCBlob + >; + using SourceFileDepGraphNodeLayout = BCRecordLayout< SOURCE_FILE_DEP_GRAPH_NODE, // ID - NodeKindField, // Dependency key node kind - DeclAspectField, // Dependency key declaration aspect - IdentifierIDField, // Dependency key mangled context type name - IdentifierIDField, // Dependency key basic name + // The next four fields correspond to the fields of the DependencyKey + // structure. + NodeKindField, // DependencyKey::kind + DeclAspectField, // DependencyKey::aspect + IdentifierIDField, // DependencyKey::context + IdentifierIDField, // DependencyKey::name BCFixed<1> // Is this a "provides" node? >; - // Optionally follows DEPENDS_ON_DEFINITION_NODE. + // Follows DEPENDS_ON_DEFINITION_NODE when the SourceFileDepGraphNode has a + // fingerprint set. using FingerprintNodeLayout = BCRecordLayout< FINGERPRINT_NODE, BCBlob >; - // Optionally follows SOURCE_FILE_DEP_GRAPH_NODE and FINGERPRINT_NODE. + // Follows SOURCE_FILE_DEP_GRAPH_NODE and FINGERPRINT_NODE when the + // SourceFileDepGraphNode has one or more depends-on entries. using DependsOnDefNodeLayout = BCRecordLayout< DEPENDS_ON_DEFINITION_NODE, - BCVBR<16> - >; - - // Optionally follows all other nodes. - using IdentifierNodeLayout = BCRecordLayout< - IDENTIFIER_NODE, - BCBlob + BCVBR<16> // The sequence number (starting from 0) of the referenced + // SOURCE_FILE_DEP_GRAPH_NODE >; } +/// Tries to read the dependency graph from the given buffer. +/// Returns true if there was an error. bool readFineGrainedDependencyGraph(llvm::MemoryBuffer &buffer, SourceFileDepGraph &g); +/// Tries to read the dependency graph from the given path name. +/// Returns true if there was an error. bool readFineGrainedDependencyGraph(llvm::StringRef path, SourceFileDepGraph &g); +/// Tries to write the dependency graph to the given path name. +/// Returns true if there was an error. bool writeFineGrainedDependencyGraph(DiagnosticEngine &diags, llvm::StringRef path, const SourceFileDepGraph &g); diff --git a/lib/AST/FineGrainedDependencies.cpp b/lib/AST/FineGrainedDependencies.cpp index 8a90050e1b3bd..4a0c99bbfcd3c 100644 --- a/lib/AST/FineGrainedDependencies.cpp +++ b/lib/AST/FineGrainedDependencies.cpp @@ -52,21 +52,11 @@ Optional SourceFileDepGraph::loadFromPath(StringRef path) { Optional SourceFileDepGraph::loadFromBuffer(llvm::MemoryBuffer &buffer) { - if (false) { - SourceFileDepGraph fg; - llvm::yaml::Input yamlReader(llvm::MemoryBufferRef(buffer), nullptr); - yamlReader >> fg; - if (yamlReader.error()) - return None; - // return fg; compiles for Mac but not Linux, because it cannot be copied. - return Optional(std::move(fg)); - } else { - SourceFileDepGraph fg; - if (swift::fine_grained_dependencies::readFineGrainedDependencyGraph( - buffer, fg)) - return None; - return Optional(std::move(fg)); - } + SourceFileDepGraph fg; + if (swift::fine_grained_dependencies::readFineGrainedDependencyGraph( + buffer, fg)) + return None; + return Optional(std::move(fg)); } //============================================================================== diff --git a/lib/AST/FineGrainedDependencyFormat.cpp b/lib/AST/FineGrainedDependencyFormat.cpp index c3b7f0ef986b1..b52cc2af98baf 100644 --- a/lib/AST/FineGrainedDependencyFormat.cpp +++ b/lib/AST/FineGrainedDependencyFormat.cpp @@ -35,6 +35,7 @@ class Deserializer { SmallVector Scratch; StringRef BlobData; + // These all return true if there was an error. bool readSignature(); bool enterTopLevelBlock(); bool readMetadata(); @@ -63,6 +64,8 @@ bool Deserializer::readSignature() { } bool Deserializer::enterTopLevelBlock() { + // Read the BLOCKINFO_BLOCK, which contains metadata used when dumping + // the binary data with llvm-bcanalyzer. { auto next = Cursor.advance(); if (!next) { @@ -80,6 +83,7 @@ bool Deserializer::enterTopLevelBlock() { return true; } + // Enters our subblock, which contains the actual dependency information. { auto next = Cursor.advance(); if (!next) { diff --git a/lib/AST/FrontendSourceFileDepGraphFactory.cpp b/lib/AST/FrontendSourceFileDepGraphFactory.cpp index 60bc24b6416ac..3f690852197f5 100644 --- a/lib/AST/FrontendSourceFileDepGraphFactory.cpp +++ b/lib/AST/FrontendSourceFileDepGraphFactory.cpp @@ -292,18 +292,7 @@ bool fine_grained_dependencies::emitReferenceDependencies( SF, outputPath, depTracker, alsoEmitDotFile) .construct(); - bool hadError = false; - if (false) { - hadError = - withOutputFile(diags, outputPath, [&](llvm::raw_pwrite_stream &out) { - out << g.yamlProlog(SF->getASTContext().hadError()); - llvm::yaml::Output yamlWriter(out); - yamlWriter << g; - return false; - }); - } else { - hadError = writeFineGrainedDependencyGraph(diags, outputPath, g); - } + bool hadError = writeFineGrainedDependencyGraph(diags, outputPath, g); // If path is stdout, cannot read it back, so check for "-" assert(outputPath == "-" || g.verifyReadsWhatIsWritten(outputPath));