From 92d4bdf5e1eaa9ecb02630906d79bfd09f5640a9 Mon Sep 17 00:00:00 2001
From: Krunoslav Zaher <krunoslav.zaher@gmail.com>
Date: Sat, 20 Aug 2016 23:06:30 +0200
Subject: [PATCH] Changes order of pre-release tests.

---
 Rx.xcworkspace/contents.xcworkspacedata | 28 -------------------------
 scripts/all-tests.sh                    | 11 ++++++----
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/Rx.xcworkspace/contents.xcworkspacedata b/Rx.xcworkspace/contents.xcworkspacedata
index 3ef3620f..25e38cfe 100644
--- a/Rx.xcworkspace/contents.xcworkspacedata
+++ b/Rx.xcworkspace/contents.xcworkspacedata
@@ -38,37 +38,9 @@
    <Group
       location = "group:scripts"
       name = "scripts">
-      <Group
-         location = "group:automation-tests"
-         name = "automation-tests">
-         <FileRef
-            location = "group:01_githubSignUp.js">
-         </FileRef>
-         <FileRef
-            location = "group:02_searchWikipedia.js">
-         </FileRef>
-         <FileRef
-            location = "group:03_masterDetail.js">
-         </FileRef>
-         <FileRef
-            location = "group:04_controlsTests.js">
-         </FileRef>
-         <FileRef
-            location = "group:05_reactivePartialUpdates.js">
-         </FileRef>
-         <FileRef
-            location = "group:common.js">
-         </FileRef>
-         <FileRef
-            location = "group:main.js">
-         </FileRef>
-      </Group>
       <FileRef
          location = "group:all-tests.sh">
       </FileRef>
-      <FileRef
-         location = "group:automation-tests.sh">
-      </FileRef>
       <FileRef
          location = "group:common.sh">
       </FileRef>
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index a703e5ec..b1dcbbb6 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -59,22 +59,25 @@ if [ "${RELEASE_TEST}" -eq 1 ]; then
 fi
 
 if [ "${RELEASE_TEST}" -eq 1 ]; then
-  scripts/validate-markdown.sh
-	scripts/validate-podspec.sh
+  	scripts/validate-markdown.sh
 fi
 
 if [ "${RELEASE_TEST}" -eq 1 ]; then
 	for configuration in ${CONFIGURATIONS[@]}
 	do
-		rx "RxSwift-tvOS" ${configuration} "Krunoslav Zaher’s iPhone" test
+		rx "RxExample-iOS" ${configuration} "Krunoslav Zaher’s iPhone" test
 	done
 
 	for configuration in ${CONFIGURATIONS[@]}
 	do
-		rx "RxSwift-tvOS" ${configuration} $DEFAULT_TVOS_SIMULATOR test
+		rx "RxExample-iOS" ${configuration} $DEFAULT_TVOS_SIMULATOR test
 	done
 fi
 
+if [ "${RELEASE_TEST}" -eq 1 ]; then
+	scripts/validate-podspec.sh
+fi
+
 #make sure all tvOS tests pass
 if [ $TV_OS -eq 1 ]; then
 	for configuration in ${CONFIGURATIONS[@]}