diff --git a/bittide-instances/data/openocd/start.sh b/bittide-instances/data/openocd/start.sh index 9a7fd6293..f390a762e 100755 --- a/bittide-instances/data/openocd/start.sh +++ b/bittide-instances/data/openocd/start.sh @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2024 Google LLC # # SPDX-License-Identifier: Apache-2.0 -set -xe +set -e # Default stdout to /dev/null OPENOCD_STDOUT_LOG="${OPENOCD_STDOUT_LOG:-/dev/null}" diff --git a/bittide-instances/src/Project/Handle.hs b/bittide-instances/src/Project/Handle.hs index 6b762a402..81c65cb24 100644 --- a/bittide-instances/src/Project/Handle.hs +++ b/bittide-instances/src/Project/Handle.hs @@ -40,7 +40,7 @@ expectLine = expectLine' "" let byteLine1 = filter (\c -> isAscii c && not (isControl c)) byteLine0 line = w2c <$> unpack byteLine1 - trimmed = (\l -> trace ("expectLine: " <> l) l) $ trimEnd line + trimmed = trimEnd line s1 = s0 <> "\n" <> line cont = expectLine' s1 h f if null trimmed