From 5387e09dc79a077ee96e3b2dd4dd1822f0a8a4da Mon Sep 17 00:00:00 2001
From: Konstantin Raev <bestander@fb.com>
Date: Sun, 3 Apr 2016 10:07:25 -0700
Subject: [PATCH] Fixed e2e test being run twice on Circle

Summary: Closes https://github.com/facebook/react-native/pull/6768

Differential Revision: D3132093

fb-gh-sync-id: 9ff9208b4549ee56c4bcf5531699857056940fc9
fbshipit-source-id: 9ff9208b4549ee56c4bcf5531699857056940fc9
---
 circle.yml          | 2 +-
 scripts/e2e-test.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 8efc7b8212ff6d..208bad61022583 100644
--- a/circle.yml
+++ b/circle.yml
@@ -77,7 +77,7 @@ test:
     - source scripts/circle-ci-android-setup.sh && retry3 ./scripts/run-android-instrumentation-tests.sh com.facebook.react.tests.gradle
 
     # JS and Android e2e test
-    - ./scripts/e2e-test.sh --packager --android
+    - source scripts/circle-ci-android-setup.sh && retry3 ./scripts/e2e-test.sh --packager --android
 
     # testing docs generation is not broken
     - cd website && node ./server/generate.js
diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh
index acbd3824af1059..52eff36f6e785a 100755
--- a/scripts/e2e-test.sh
+++ b/scripts/e2e-test.sh
@@ -44,6 +44,7 @@ function cleanup {
   rm $MARKER_IOS
   rm $MARKER_ANDROID
   [ $SERVER_PID ] && kill -9 $SERVER_PID
+  exit $EXIT_CODE
 }
 trap cleanup EXIT