Fixed e2e test being run twice on Circle

bestander · Facebook Github Bot 3 · commit 5387e09dc79a · 2016-04-03T10:08:19.000-07:00
Summary: Closes facebook#6768 Differential Revision: D3132093 fb-gh-sync-id: 9ff9208b4549ee56c4bcf5531699857056940fc9 fbshipit-source-id: 9ff9208b4549ee56c4bcf5531699857056940fc9
diff --git 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
@@ -44,6 +44,7 @@ function cleanup {
   rm $MARKER_IOS
   rm $MARKER_ANDROID
   [ $SERVER_PID ] && kill -9 $SERVER_PID
+  exit $EXIT_CODE
 }
 trap cleanup EXIT
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ function cleanup {`
`44`	`44`	`rm $MARKER_IOS`
`45`	`45`	`rm $MARKER_ANDROID`
`46`	`46`	`[ $SERVER_PID ] && kill -9 $SERVER_PID`
	`47`	`+ exit $EXIT_CODE`
`47`	`48`	`}`
`48`	`49`	`trap cleanup EXIT`
`49`	`50`