From eb7839e0ec1c16d68abcfd753b747cf5ecaf153a Mon Sep 17 00:00:00 2001
From: Jeff Cross <middlefloor@gmail.com>
Date: Tue, 22 Sep 2015 11:32:14 -0700
Subject: [PATCH] fix(build): temporarily test dart with dart2js instead of pub
 serve

Should be changed back when #4316 is resolved.
---
 scripts/ci/test_e2e_dart.sh    | 13 +++++++------
 scripts/ci/test_perf.sh        | 11 ++++++-----
 scripts/ci/test_server_dart.sh | 11 ++++++-----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/scripts/ci/test_e2e_dart.sh b/scripts/ci/test_e2e_dart.sh
index 18ec1a7565..b4ca574c52 100755
--- a/scripts/ci/test_e2e_dart.sh
+++ b/scripts/ci/test_e2e_dart.sh
@@ -15,14 +15,15 @@ function killServer () {
 # Serving pre-compiled dart JS takes an extra 15m.
 # So we do this only for post-commit testing.
 # Pull requests test with Dartium and pub serve
-if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
-  # WARNING: the build/pubbuild.dart task is assumed to have been run before, in test_server_dart.sh 
+# TODO(jeffbcross): restore conditional dart2js/pubserve #4316
+#if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
+  # WARNING: the build/pubbuild.dart task is assumed to have been run before, in test_server_dart.sh
   ./node_modules/.bin/gulp serve.js.dart2js&
   serverPid=$!
-else
-  ./node_modules/.bin/gulp serve.dart&
-  serverPid=$!
-fi
+#else
+#  ./node_modules/.bin/gulp serve.dart&
+#  serverPid=$!
+#fi
 
 ./node_modules/.bin/gulp build.css.material&
 
diff --git a/scripts/ci/test_perf.sh b/scripts/ci/test_perf.sh
index 6906f29fff..3b4693decc 100755
--- a/scripts/ci/test_perf.sh
+++ b/scripts/ci/test_perf.sh
@@ -16,14 +16,15 @@ function killServer () {
 # Serving pre-compiled dart JS takes an extra 15m.
 # So we do this only for post-commit testing.
 # Pull requests test with Dartium and pub serve
-if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
+# TODO(jeffbcross): restore conditional dart2js/pubserve #4316
+#if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
   ./node_modules/.bin/gulp build/pubbuild.dart
   ./node_modules/.bin/gulp serve.js.prod serve.js.dart2js&
   serverPid=$!
-else
-  ./node_modules/.bin/gulp serve.js.prod serve.dart&
-  serverPid=$!
-fi
+#else
+#  ./node_modules/.bin/gulp serve.js.prod serve.dart&
+#  serverPid=$!
+#fi
 
 trap killServer EXIT
 
diff --git a/scripts/ci/test_server_dart.sh b/scripts/ci/test_server_dart.sh
index 90c6c6046f..7be197213c 100755
--- a/scripts/ci/test_server_dart.sh
+++ b/scripts/ci/test_server_dart.sh
@@ -14,14 +14,15 @@ ps -ef | grep webdriver-manager
 # Serving pre-compiled dart JS takes an extra 15m.
 # So we do this only for post-commit testing.
 # Pull requests test with Dartium and pub serve
-if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
+# TODO(jeffbcross): restore conditional dart2js/pubserve #4316
+#if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
   ./node_modules/.bin/gulp build/pubbuild.dart
   ./node_modules/.bin/gulp serve.js.dart2js&
   serverPid=$!
-else
-  ./node_modules/.bin/gulp serve.dart&
-  serverPid=$!
-fi
+#else
+#  ./node_modules/.bin/gulp serve.dart&
+#  serverPid=$!
+#fi
 
 function killAllServers () {
   kill $serverPid