Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/Build/llbuild.swift
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public struct LLBuildManifestGenerator {

args += ["-c", path.source.asString, "-o", path.object.asString]
let clang = ClangTool(
desc: "Compile \(target.target.name) \(path.filename.asString)",
desc: "Compiling \(target.target.name) \(path.filename.asString)",
//FIXME: Should we add build time dependency on dependent targets?
inputs: [path.source.asString],
outputs: [path.object.asString],
Expand Down
6 changes: 3 additions & 3 deletions Tests/BuildTests/IncrementalBuildTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ final class IncrementalBuildTests: XCTestCase {
// Check various things that we expect to see in the full build log.
// FIXME: This is specific to the format of the log output, which
// is quite unfortunate but not easily avoidable at the moment.
XCTAssertTrue(fullLog.contains("Compile CLibrarySources Foo.c"))
XCTAssertTrue(fullLog.contains("Compiling CLibrarySources Foo.c"))

let llbuildManifest = prefix.appending(components: ".build", "debug.yaml")

Expand All @@ -62,15 +62,15 @@ final class IncrementalBuildTests: XCTestCase {

// Now build again. This should be an incremental build.
let log2 = try executeSwiftBuild(prefix)
XCTAssertTrue(log2.contains("Compile CLibrarySources Foo.c"))
XCTAssertTrue(log2.contains("Compiling CLibrarySources Foo.c"))

// Read the second llbuild manifest.
let llbuildContents2 = try localFileSystem.readFileContents(llbuildManifest)

// Now build again without changing anything. This should be a null
// build.
let log3 = try executeSwiftBuild(prefix)
XCTAssertFalse(log3.contains("Compile CLibrarySources Foo.c"))
XCTAssertFalse(log3.contains("Compiling CLibrarySources Foo.c"))

// Read the third llbuild manifest.
let llbuildContents3 = try localFileSystem.readFileContents(llbuildManifest)
Expand Down
2 changes: 1 addition & 1 deletion Tests/CommandsTests/RunToolTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ final class RunToolTests: XCTestCase {
"""))

// swift-build-tool output should go to stderr.
XCTAssertMatch(try result.utf8stderrOutput(), .contains("Compile Swift Module"))
XCTAssertMatch(try result.utf8stderrOutput(), .regex("Compil(e|ing) Swift Module"))
XCTAssertMatch(try result.utf8stderrOutput(), .contains("Linking"))

do {
Expand Down
2 changes: 1 addition & 1 deletion Utilities/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ class Target(object):

print(" %s:" % json.dumps(object_path), file=output)
print(" tool: clang", file=output)
print(" description: Compile %s" % filename, file=output)
print(" description: Compiling %s" % filename, file=output)
print(" inputs: %s" % json.dumps([source]), file=output)
print(" outputs: %s" % json.dumps([object_path]), file=output)
print(" args: %s" % json.dumps(args), file=output)
Expand Down