Add test with multiple TUs in one command line

Author: cpsughrue

clang/include/clang/Basic/DiagnosticFrontendKinds.td

@@ -284,7 +284,8 @@ def remark_mbd_connection :
   Remark<"Successfully connected to module build daemon at %0">,
   InGroup<ModuleBuildDaemon>;
 def remark_mbd_handshake :
-  Remark<"Successfully completed handshake with module build daemon">,
+  Remark<"Clang invocation responsible for %0 successfully completed handshake "
+         "with module build daemon">,
   InGroup<ModuleBuildDaemon>;
 
 def warn_eagerly_load_for_standard_cplusplus_modules : Warning<

clang/lib/Tooling/ModuleBuildDaemon/Frontend.cpp

@@ -145,7 +145,8 @@ void spawnModuleBuildDaemonAndHandshake(const CompilerInvocation &Clang,
     return;
   }
 
-  Diag.Report(diag::remark_mbd_handshake);
+  Diag.Report(diag::remark_mbd_handshake)
+      << Clang.getFrontendOpts().Inputs[0].getFile();
   return;
 }
 

clang/test/ModuleBuildDaemon/daemon-crash.c

@@ -3,7 +3,7 @@
 // RUN: rm -rf mbd-crash %t
 
 // timeout should exit with status 124 which is treated as a failure by lit on 
-// windows. Ideally we would be like to check the exit code and only return true
+// windows. Ideally we would like to check the exit code and only return true
 // if it equals 124 but lit does not support global bash sysmbols like $?
 
 // RUN: timeout --signal=SIGKILL 2 %clang -cc1modbuildd mbd-crash -v || true

clang/test/ModuleBuildDaemon/daemon-launch.c

@@ -3,7 +3,7 @@
 // RUN: rm -rf mbd-launch %t
 
 // timeout should exit with status 124 which is treated as a failure by lit on 
-// windows. Ideally we would be like to check the exit code and only return true
+// windows. Ideally we would like to check the exit code and only return true
 // if it equals 124 but lit does not support global bash sysmbols like $?
 
 // RUN: timeout --signal=SIGTERM 2 %clang -cc1modbuildd mbd-launch -v || true

clang/test/ModuleBuildDaemon/handshake.c

@@ -7,6 +7,7 @@
 //--- main.c
 int main() {return 0;}
 
+// Return true regardless so lit test does not exit before daemon is killed
 // RUN: %clang -fmodule-build-daemon=mbd-handshake -Rmodule-build-daemon %t/main.c &> %t/output-new || true
 // RUN: %clang -fmodule-build-daemon=mbd-handshake -Rmodule-build-daemon %t/main.c &> %t/output-existing || true
 // RUN: %kill-process "-cc1modbuildd mbd-handshake"
@@ -15,11 +16,11 @@ int main() {return 0;}
 // RUN: cat %t/output-existing |  sed 's:\\\\\?:/:g' | FileCheck %s --check-prefix=CHECK-EXIST
 
 // CHECK: remark: Successfully spawned module build daemon [-Rmodule-build-daemon]
-// CHECK: remark: Successfully connected to module build daemon at mbd-handshake/mbd.sock [-Rmodule-build-daemon]
-// CHECK: remark: Successfully completed handshake with module build daemon [-Rmodule-build-daemon]
+// CHECK-NEXT: remark: Successfully connected to module build daemon at mbd-handshake/mbd.sock [-Rmodule-build-daemon]
+// CHECK-NEXT: remark: Clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
 
 // Check that a clang invocation can handshake with an existing module build daemon
-// CHECK-EXIST: remark: Successfully completed handshake with module build daemon [-Rmodule-build-daemon]
+// CHECK-EXIST: remark: Clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
 
 // Make sure mbd.err is empty
 // RUN: [ ! -s "mbd-launch/mbd.err" ] && true || false

clang/test/ModuleBuildDaemon/multiple-tu.c

@@ -0,0 +1,27 @@
+// Check that a driver command line with multiple translation units can create two 
+// frontend invocations which can successfully handshake with the module build daemon
+
+// RUN: %kill-process "-cc1modbuildd mbd-multiple-tu"
+// RUN: rm -rf mbd-multiple-tu %t
+// RUN: split-file %s %t
+
+//--- foo.c
+int foo() {return 0;}
+
+//--- main.c
+int foo();
+int main() {return foo();}
+
+// Return true regardless so lit test does not exit before daemon is killed
+// RUN: %clang -fmodule-build-daemon=mbd-multiple-tu -Rmodule-build-daemon %t/main.c %t/foo.c &> %t/output || true
+// RUN: %kill-process "-cc1modbuildd mbd-multiple-tu"
+
+// RUN: cat %t/output |  sed 's:\\\\\?:/:g' | FileCheck %s
+
+// CHECK: remark: Successfully spawned module build daemon [-Rmodule-build-daemon]
+// CHECK-NEXT: remark: Successfully connected to module build daemon at mbd-multiple-tu/mbd.sock [-Rmodule-build-daemon]
+// CHECK-DAG: remark: Clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
+// CHECK-DAG: remark: Clang invocation responsible for {{.*foo.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
+
+// Make sure mbd.err is empty
+// RUN: [ ! -s "mbd-launch/mbd.err" ] && true || false