Merge pull request #527 from artemcm/revertTestFeatureDisable

Revert "Tweak test relying on versioned clang module re-scanning to not need it."

Author: artemcm

TestInputs/ExplicitModuleBuilds/CHeaders/G.h

@@ -1,7 +1,5 @@
-//#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 110000
-// FIXME: Versioned re-scanning has an intermittend failure so the test that relies on it is disabled
-// temporarily (rdar://74812312)
+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 110000
 #include "X.h"
-//#endif
+#endif
 
 void funcG(void);

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -628,10 +628,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
       let expectedNumberOfDependencies: Int
       if driver.targetTriple.isMacOSX,
          driver.targetTriple.version(for: .macOS) >= Triple.Version(11, 0, 0) {
-        // FIXME: Versioned re-scanning has an intermittend failure so the test that relies on it
-        // is disabled temporarily (rdar://74812312)
-        // expectedNumberOfDependencies = 11
-        expectedNumberOfDependencies = 12
+        expectedNumberOfDependencies = 11
       } else {
         expectedNumberOfDependencies = 12
       }