diff options
| author | Josh Tilles | 2014-04-11 14:25:21 -0400 |
|---|---|---|
| committer | Adam Vandenberg | 2014-04-12 09:10:55 -0700 |
| commit | 049bfda0b47ea851cb0241642ae26170915be616 (patch) | |
| tree | 5ebeb2553c0c5208b731842bfcbddbe45826de9e /Library/Formula/ghc.rb | |
| parent | 2a9144b2faa3dda4b06bdca8056ff74ea86ce6bf (diff) | |
| download | homebrew-049bfda0b47ea851cb0241642ae26170915be616.tar.bz2 | |
ghc: fix running of optional testsuite
`brew install ghc --tests` emits a bunch of warnings and subsequently
fails because staging the "testsuite" resource makes its files
available in a `testsuite` subdirectory—*not* in the current
directory, which is where the formula *expects* them to be.
Closes #28330.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula/ghc.rb')
| -rw-r--r-- | Library/Formula/ghc.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Library/Formula/ghc.rb b/Library/Formula/ghc.rb index 2e2dadd4f..bf1caf64a 100644 --- a/Library/Formula/ghc.rb +++ b/Library/Formula/ghc.rb @@ -128,11 +128,13 @@ class Ghc < Formula if build.include? "tests" resource("testsuite").stage do - (buildpath+"Ghcsource/config").install Dir["config/*"] - (buildpath+"Ghcsource/driver").install Dir["driver/*"] - (buildpath+"Ghcsource/mk").install Dir["mk/*"] - (buildpath+"Ghcsource/tests").install Dir["tests/*"] - (buildpath+"Ghcsource/timeout").install Dir["timeout/*"] + cd "testsuite" do + (buildpath+"Ghcsource/config").install Dir["config/*"] + (buildpath+"Ghcsource/driver").install Dir["driver/*"] + (buildpath+"Ghcsource/mk").install Dir["mk/*"] + (buildpath+"Ghcsource/tests").install Dir["tests/*"] + (buildpath+"Ghcsource/timeout").install Dir["timeout/*"] + end cd (buildpath+"Ghcsource/tests") do system "make", "CLEANUP=1", "THREADS=#{ENV.make_jobs}", "fast" end |