Skip to content

Commit 2e448d1

Browse files
authored
Fix test-only failure for ghcjs (#2180)
* Fix test-only failure for ghcjs The new `default-setup-ghcjs` has a longer name than `default-setup` and that causes the word `do` to wrap onto the next line. The expected error now looks like this for ghcjs: ``` Error: default-setup-ghcjs: No executables and no library found. Nothing to do. ```
1 parent 7e140fc commit 2e448d1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builder/comp-builder.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ let
545545
# we assume that if the SETUP_HS command fails and the following line was found in the error
546546
# log, that it was the only error. Hence if we do _not_ find the line, grep will fail and this derivation
547547
# will be marked as failure.
548-
cat $SETUP_ERR | grep 'No executables and no library found\. Nothing to do\.'
548+
cat $SETUP_ERR | tr '\n' ' ' | tr -d '\r' | grep 'No executables and no library found\. Nothing to do\.'
549549
fi
550550
''}
551551
${lib.optionalString (haskellLib.isLibrary componentId) ''

0 commit comments

Comments
 (0)