From c701b9b99dc78be144b037cb1941cac8c93ca77d Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Thu, 23 Jan 2020 11:54:35 +0100
Subject: [PATCH] debug lsp tests

changelog_begin
changelog_end
---
 build.sh                       | 33 +--------------------------------
 compiler/lsp-tests/BUILD.bazel |  2 +-
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/build.sh b/build.sh
index 0b07f4aead9f..33a9fb92caa8 100755
--- a/build.sh
+++ b/build.sh
@@ -13,35 +13,4 @@ export LC_ALL=en_US.UTF-8
 
 ARTIFACT_DIRS="${BUILD_ARTIFACTSTAGINGDIRECTORY:-$PWD}"
 
-# Bazel test only builds targets that are dependencies of a test suite
-# so do a full build first.
-(
-  cd compiler
-  # Bazel also limits cache downloads by -j so increasing this to a ridiculous value
-  # helps. Bazel separately controls the number of jobs using CPUs so this should not
-  # overload machines.
-  # This also appears to be what Google uses internally, see
-  # https://github.com/bazelbuild/bazel/issues/6394#issuecomment-436234594.
-  bazel build -j 200 //... --experimental_execution_log_file "$ARTIFACT_DIRS/build_execution${execution_log_postfix}.log"
-)
-tag_filter=""
-if [[ "$execution_log_postfix" == "_Darwin" ]]; then
-  tag_filter="-dont-run-on-darwin"
-fi
-bazel test -j 200 //... --test_tag_filters "$tag_filter" --experimental_execution_log_file "$ARTIFACT_DIRS/test_execution${execution_log_postfix}.log"
-# Make sure that Bazel query works.
-bazel query 'deps(//...)' > /dev/null
-# Check that we can load damlc in ghci
-GHCI_SCRIPT=$(mktemp)
-function cleanup {
-  rm -rf "$GHCI_SCRIPT"
-}
-trap cleanup EXIT
-# Disabled on darwin since it sometimes seem to hang and this only
-# tests our dev setup rather than our code so issues are not critical.
-if [[ "$(uname)" != "Darwin" ]]; then
-    da-ghci --data yes //compiler/damlc:damlc -e ':main --help'
-fi
-# Check that our IDE works on our codebase
-./compiler/ghcide-daml.sh compiler/damlc/exe/Main.hs 2>&1 | tee ide-log
-grep -q "1 file worked, 0 files failed" ide-log
+bazel test //compiler/lsp-tests:lsp-tests --runs_per_test=20
diff --git a/compiler/lsp-tests/BUILD.bazel b/compiler/lsp-tests/BUILD.bazel
index 86594d17a8ea..587617afea45 100644
--- a/compiler/lsp-tests/BUILD.bazel
+++ b/compiler/lsp-tests/BUILD.bazel
@@ -12,7 +12,7 @@ da_haskell_test(
         "//compiler/damlc",
     ],
     # see https://github.com/digital-asset/daml/issues/4152
-    flaky = True,
+    flaky = False,
     hackage_deps = [
         "aeson",
         "base",