From 2b8b0d4b6704bb4650bced4ae8bf72d13617dff8 Mon Sep 17 00:00:00 2001
From: Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>
Date: Sat, 20 Dec 2014 04:34:00 -0800
Subject: [PATCH] Give RCL fixture its own copies of Quick & Nimble

Avoids Xcode barfing on dependency resolution while running
Carthage's tests with the workspace open.
---
 .gitmodules                                                   | 3 +++
 Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick    | 1 +
 .../ReactiveCocoaLayout.xcworkspace/contents.xcworkspacedata  | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 160000 Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick

diff --git a/.gitmodules b/.gitmodules
index bd03a25ac4..1d4a62b1d7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "Carthage/Checkouts/ReactiveTask"]
 	path = Carthage/Checkouts/ReactiveTask
 	url = https://github.com/Carthage/ReactiveTask.git
+[submodule "Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick"]
+	path = Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick
+	url = https://github.com/Quick/Quick.git
diff --git a/Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick b/Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick
new file mode 160000
index 0000000000..315ae2a4a6
--- /dev/null
+++ b/Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/Quick
@@ -0,0 +1 @@
+Subproject commit 315ae2a4a630156d5ac094ae1f107af60edce21d
diff --git a/Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/ReactiveCocoaLayout.xcworkspace/contents.xcworkspacedata b/Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/ReactiveCocoaLayout.xcworkspace/contents.xcworkspacedata
index 7c0dcda5f0..82d42759c2 100644
--- a/Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/ReactiveCocoaLayout.xcworkspace/contents.xcworkspacedata
+++ b/Source/CarthageKitTests/fixtures/ReactiveCocoaLayout/ReactiveCocoaLayout.xcworkspace/contents.xcworkspacedata
@@ -5,9 +5,9 @@
       location = "group:ReactiveCocoaLayout.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:../../../../Carthage/Checkouts/Quick/Quick.xcodeproj">
+      location = "group:Quick/Externals/Nimble/Nimble.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:../../../../Carthage/Checkouts/Nimble/Nimble.xcodeproj">
+      location = "group:Quick/Quick.xcodeproj">
    </FileRef>
 </Workspace>