Merge pull request swiftlang#30143 from davidungar/just-tests-2-29

David Ungar · web-flow · commit ff1398ef0a6b · 2020-02-29T13:16:08.000-08:00
[NFC, Incremental] Add class, enum, protocol tests for type-fingerprints
diff --git a/test/Frontend/Fingerprints/Inputs/class-fingerprint/definesAB-after.swift b/test/Frontend/Fingerprints/Inputs/class-fingerprint/definesAB-after.swift
@@ -0,0 +1,5 @@
+class A {
+  var x = 17
+}
+class B {
+}
diff --git a/test/Frontend/Fingerprints/Inputs/class-fingerprint/definesAB-before.swift b/test/Frontend/Fingerprints/Inputs/class-fingerprint/definesAB-before.swift
@@ -0,0 +1,4 @@
+class A {
+}
+class B {
+}
diff --git a/test/Frontend/Fingerprints/Inputs/class-fingerprint/main.swift b/test/Frontend/Fingerprints/Inputs/class-fingerprint/main.swift
diff --git a/test/Frontend/Fingerprints/Inputs/class-fingerprint/ofm.json b/test/Frontend/Fingerprints/Inputs/class-fingerprint/ofm.json
diff --git a/test/Frontend/Fingerprints/Inputs/class-fingerprint/usesA.swift b/test/Frontend/Fingerprints/Inputs/class-fingerprint/usesA.swift
diff --git a/test/Frontend/Fingerprints/Inputs/class-fingerprint/usesB.swift b/test/Frontend/Fingerprints/Inputs/class-fingerprint/usesB.swift
diff --git a/test/Frontend/Fingerprints/Inputs/enum-fingerprint/definesAB-after.swift b/test/Frontend/Fingerprints/Inputs/enum-fingerprint/definesAB-after.swift
@@ -0,0 +1,7 @@
+enum A {
+  case a1
+  var pi: Int {3}
+}
+enum B {
+  case a1
+}
diff --git a/test/Frontend/Fingerprints/Inputs/enum-fingerprint/definesAB-before.swift b/test/Frontend/Fingerprints/Inputs/enum-fingerprint/definesAB-before.swift
@@ -0,0 +1,6 @@
+enum A {
+  case a1
+}
+enum B {
+  case a1
+}
diff --git a/test/Frontend/Fingerprints/Inputs/enum-fingerprint/main.swift b/test/Frontend/Fingerprints/Inputs/enum-fingerprint/main.swift
@@ -0,0 +1 @@
+
diff --git a/test/Frontend/Fingerprints/Inputs/enum-fingerprint/ofm.json b/test/Frontend/Fingerprints/Inputs/enum-fingerprint/ofm.json
@@ -0,0 +1,22 @@
+{
+  "main.swift": {
+    "object": "./main.o",
+    "swift-dependencies": "./main.swiftdeps"
+  },
+  "definesAB.swift": {
+    "object": "./definesAB.o",
+    "swift-dependencies": "./definesAB.swiftdeps"
+  },
+  "usesA.swift": {
+    "object": "./usesA.o",
+    "swift-dependencies": "./usesA.swiftdeps"
+  },
+  "usesB.swift": {
+    "object": "./usesB.o",
+    "swift-dependencies": "./usesB.swiftdeps"
+  },
+  "": {
+    "swift-dependencies": "./main~buildrecord.swiftdeps"
+  }
+}
+
diff --git a/test/Frontend/Fingerprints/Inputs/enum-fingerprint/usesA.swift b/test/Frontend/Fingerprints/Inputs/enum-fingerprint/usesA.swift
@@ -0,0 +1 @@
+let a = A.a1
diff --git a/test/Frontend/Fingerprints/Inputs/enum-fingerprint/usesB.swift b/test/Frontend/Fingerprints/Inputs/enum-fingerprint/usesB.swift
@@ -0,0 +1 @@
+let b = B.a1
diff --git a/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/definesAB-after.swift b/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/definesAB-after.swift
@@ -0,0 +1,5 @@
+protocol A {
+  var x: Int {get}
+}
+protocol B {
+}
diff --git a/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/definesAB-before.swift b/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/definesAB-before.swift
@@ -0,0 +1,4 @@
+protocol A {
+}
+protocol B {
+}
diff --git a/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/main.swift b/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/main.swift
@@ -0,0 +1 @@
+
diff --git a/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/ofm.json b/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/ofm.json
@@ -0,0 +1,22 @@
+{
+  "main.swift": {
+    "object": "./main.o",
+    "swift-dependencies": "./main.swiftdeps"
+  },
+  "definesAB.swift": {
+    "object": "./definesAB.o",
+    "swift-dependencies": "./definesAB.swiftdeps"
+  },
+  "usesA.swift": {
+    "object": "./usesA.o",
+    "swift-dependencies": "./usesA.swiftdeps"
+  },
+  "usesB.swift": {
+    "object": "./usesB.o",
+    "swift-dependencies": "./usesB.swiftdeps"
+  },
+  "": {
+    "swift-dependencies": "./main~buildrecord.swiftdeps"
+  }
+}
+
diff --git a/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/usesA.swift b/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/usesA.swift
@@ -0,0 +1,3 @@
+struct SA: A {
+  var x = 3
+}
diff --git a/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/usesB.swift b/test/Frontend/Fingerprints/Inputs/protocol-fingerprint/usesB.swift
@@ -0,0 +1,2 @@
+struct SB: B {
+}
diff --git a/test/Frontend/Fingerprints/Inputs/struct-fingerprint/definesAB-after.swift b/test/Frontend/Fingerprints/Inputs/struct-fingerprint/definesAB-after.swift
diff --git a/test/Frontend/Fingerprints/Inputs/struct-fingerprint/definesAB-before.swift b/test/Frontend/Fingerprints/Inputs/struct-fingerprint/definesAB-before.swift
diff --git a/test/Frontend/Fingerprints/Inputs/struct-fingerprint/main.swift b/test/Frontend/Fingerprints/Inputs/struct-fingerprint/main.swift
@@ -0,0 +1 @@
+
diff --git a/test/Frontend/Fingerprints/Inputs/struct-fingerprint/ofm.json b/test/Frontend/Fingerprints/Inputs/struct-fingerprint/ofm.json
@@ -0,0 +1,22 @@
+{
+  "main.swift": {
+    "object": "./main.o",
+    "swift-dependencies": "./main.swiftdeps"
+  },
+  "definesAB.swift": {
+    "object": "./definesAB.o",
+    "swift-dependencies": "./definesAB.swiftdeps"
+  },
+  "usesA.swift": {
+    "object": "./usesA.o",
+    "swift-dependencies": "./usesA.swiftdeps"
+  },
+  "usesB.swift": {
+    "object": "./usesB.o",
+    "swift-dependencies": "./usesB.swiftdeps"
+  },
+  "": {
+    "swift-dependencies": "./main~buildrecord.swiftdeps"
+  }
+}
+
diff --git a/test/Frontend/Fingerprints/Inputs/struct-fingerprint/usesA.swift b/test/Frontend/Fingerprints/Inputs/struct-fingerprint/usesA.swift
@@ -0,0 +1 @@
+let a = A()
diff --git a/test/Frontend/Fingerprints/Inputs/struct-fingerprint/usesB.swift b/test/Frontend/Fingerprints/Inputs/struct-fingerprint/usesB.swift
@@ -0,0 +1 @@
+let b = B()
diff --git a/test/Frontend/Fingerprints/class-fingerprint.swift b/test/Frontend/Fingerprints/class-fingerprint.swift
@@ -0,0 +1,79 @@
+
+// Test per-type-body fingerprints for classes
+//
+
+// =============================================================================
+// Without the fingerprints
+// =============================================================================
+
+// Establish status quo
+
+
+// RUN: %empty-directory(%t)
+// RUN: cp %S/Inputs/class-fingerprint/* %t
+// RUN: cp %t/definesAB{-before,}.swift
+
+// Seeing weird failure on CI, so set the mod times
+// RUN: touch -t 200101010101 %t/*.swift
+
+// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
+
+// Change one type, but uses of all types get recompiled
+
+// RUN: cp %t/definesAB{-after,}.swift
+
+// Seeing weird failure on CI, so ensure that definesAB.swift is newer
+// RUN: touch -t 200201010101 %t/*
+// RUN: touch -t 200101010101 %t/*.swift
+// RUN: touch -t 200301010101 %t/definesAB.swift
+
+// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+
+// Save for debugging:
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
+
+// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output2
+
+// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
+// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
+// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+
+// =============================================================================
+// With the fingerprints
+// =============================================================================
+
+// Establish status quo
+
+// RUN: %empty-directory(%t)
+// RUN: cp %S/Inputs/class-fingerprint/* %t
+// RUN: cp %t/definesAB{-before,}.swift
+
+// Seeing weird failure on CI, so set the mod times
+// RUN: touch -t 200101010101 %t/*.swift
+
+// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
+
+
+// Change one type, only uses of that type get recompiled
+
+// RUN: cp %t/definesAB{-after,}.swift
+
+// Seeing weird failure on CI, so ensure that definesAB.swift is newer
+// RUN: touch -t 200201010101 %t/*
+// RUN: touch -t 200101010101 %t/*.swift
+// RUN: touch -t 200301010101 %t/definesAB.swift
+
+// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
+
+// RUN: %FileCheck -check-prefix=CHECK-MAINB-RECOMPILED %s < %t/output4
+
+// CHECK-MAINB-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+// CHECK-MAINB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
+// CHECK-MAINB-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+
diff --git a/test/Frontend/Fingerprints/enum-fingerprint.swift b/test/Frontend/Fingerprints/enum-fingerprint.swift
@@ -1,5 +1,5 @@
 
-// Test per-type-body fingerprints
+// Test per-type-body fingerprints for enums
 //
 
 // =============================================================================
@@ -10,7 +10,7 @@
 
 
 // RUN: %empty-directory(%t)
-// RUN: cp %S/Inputs/type-fingerprint/* %t
+// RUN: cp %S/Inputs/enum-fingerprint/* %t
 // RUN: cp %t/definesAB{-before,}.swift
 
 // Seeing weird failure on CI, so set the mod times
@@ -47,7 +47,7 @@
 // Establish status quo
 
 // RUN: %empty-directory(%t)
-// RUN: cp %S/Inputs/type-fingerprint/* %t
+// RUN: cp %S/Inputs/enum-fingerprint/* %t
 // RUN: cp %t/definesAB{-before,}.swift
 
 // Seeing weird failure on CI, so set the mod times
diff --git a/test/Frontend/Fingerprints/protocol-fingerprint.swift b/test/Frontend/Fingerprints/protocol-fingerprint.swift
@@ -0,0 +1,79 @@
+
+// Test per-type-body fingerprints: the protocol case.
+//
+
+// =============================================================================
+// Without the fingerprints
+// =============================================================================
+
+// Establish status quo
+
+
+// RUN: %empty-directory(%t)
+// RUN: cp %S/Inputs/protocol-fingerprint/* %t
+// RUN: cp %t/definesAB{-before,}.swift
+
+// Seeing weird failure on CI, so set the mod times
+// RUN: touch -t 200101010101 %t/*.swift
+
+// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
+
+// Change one type, but uses of all types get recompiled
+
+// RUN: cp %t/definesAB{-after,}.swift
+
+// Seeing weird failure on CI, so ensure that definesAB.swift is newer
+// RUN: touch -t 200201010101 %t/*
+// RUN: touch -t 200101010101 %t/*.swift
+// RUN: touch -t 200301010101 %t/definesAB.swift
+
+// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+
+// Save for debugging:
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
+
+// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output2
+
+// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
+// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
+// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+
+// =============================================================================
+// With the fingerprints
+// =============================================================================
+
+// Establish status quo
+
+// RUN: %empty-directory(%t)
+// RUN: cp %S/Inputs/protocol-fingerprint/* %t
+// RUN: cp %t/definesAB{-before,}.swift
+
+// Seeing weird failure on CI, so set the mod times
+// RUN: touch -t 200101010101 %t/*.swift
+
+// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
+
+
+// Change one type, only uses of that type get recompiled
+
+// RUN: cp %t/definesAB{-after,}.swift
+
+// Seeing weird failure on CI, so ensure that definesAB.swift is newer
+// RUN: touch -t 200201010101 %t/*
+// RUN: touch -t 200101010101 %t/*.swift
+// RUN: touch -t 200301010101 %t/definesAB.swift
+
+// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
+
+// RUN: %FileCheck -check-prefix=CHECK-MAINB-RECOMPILED %s < %t/output4
+
+// CHECK-MAINB-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+// CHECK-MAINB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
+// CHECK-MAINB-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+
diff --git a/test/Frontend/Fingerprints/struct-fingerprint.swift b/test/Frontend/Fingerprints/struct-fingerprint.swift
@@ -0,0 +1,79 @@
+
+// Test per-type-body fingerprints for structs
+//
+
+// =============================================================================
+// Without the fingerprints
+// =============================================================================
+
+// Establish status quo
+
+
+// RUN: %empty-directory(%t)
+// RUN: cp %S/Inputs/struct-fingerprint/* %t
+// RUN: cp %t/definesAB{-before,}.swift
+
+// Seeing weird failure on CI, so set the mod times
+// RUN: touch -t 200101010101 %t/*.swift
+
+// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output1
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
+
+// Change one type, but uses of all types get recompiled
+
+// RUN: cp %t/definesAB{-after,}.swift
+
+// Seeing weird failure on CI, so ensure that definesAB.swift is newer
+// RUN: touch -t 200201010101 %t/*
+// RUN: touch -t 200101010101 %t/*.swift
+// RUN: touch -t 200301010101 %t/definesAB.swift
+
+// RUN: cd %t && %swiftc_driver  -disable-type-fingerprints -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift  -module-name main -output-file-map ofm.json >&output2
+
+// Save for debugging:
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB1.swiftdeps
+
+// RUN: %FileCheck -check-prefix=CHECK-MAINAB-RECOMPILED %s < %t/output2
+
+// CHECK-MAINAB-RECOMPILED: Queuing (initial): {compile: definesAB.o <= definesAB.swift}
+// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
+// CHECK-MAINAB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+
+// =============================================================================
+// With the fingerprints
+// =============================================================================
+
+// Establish status quo
+
+// RUN: %empty-directory(%t)
+// RUN: cp %S/Inputs/struct-fingerprint/* %t
+// RUN: cp %t/definesAB{-before,}.swift
+
+// Seeing weird failure on CI, so set the mod times
+// RUN: touch -t 200101010101 %t/*.swift
+
+// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output3
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB3.swiftdeps
+
+
+// Change one type, only uses of that type get recompiled
+
+// RUN: cp %t/definesAB{-after,}.swift
+
+// Seeing weird failure on CI, so ensure that definesAB.swift is newer
+// RUN: touch -t 200201010101 %t/*
+// RUN: touch -t 200101010101 %t/*.swift
+// RUN: touch -t 200301010101 %t/definesAB.swift
+
+// RUN: cd %t && %swiftc_driver  -enable-batch-mode -j2 -incremental -driver-show-incremental main.swift definesAB.swift usesA.swift usesB.swift -module-name main -output-file-map ofm.json >&output4
+
+// only-run-for-debugging: cp %t/usesB.swiftdeps %t/usesB4.swiftdeps
+
+// RUN: %FileCheck -check-prefix=CHECK-MAINB-RECOMPILED %s < %t/output4
+
+// CHECK-MAINB-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+// CHECK-MAINB-RECOMPILED: Queuing because of dependencies discovered later: {compile: usesA.o <= usesA.swift}
+// CHECK-MAINB-RECOMPILED-NOT: Queuing because of dependencies discovered later: {compile: usesB.o <= usesB.swift}
+

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +class A {
 +}
 +class B {
 +}