[commit: nofib] master: spectral/sphere: simplify Makefile (bdefa19)

git at git.haskell.org git at git.haskell.org
Thu May 4 18:24:18 UTC 2017


Repository : ssh://git@git.haskell.org/nofib

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bdefa193d17314f8637622db81f32c55103ef942/nofib

>---------------------------------------------------------------

commit bdefa193d17314f8637622db81f32c55103ef942
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Thu May 4 08:46:43 2017 -0400

    spectral/sphere: simplify Makefile
    
    By simply renaming the expected output files to follow the usual
    conventions, we can simplify the `Makefile` a bit.
    
    Signed-off-by: Michal Terepeta <michal.terepeta at gmail.com>
    
    Test Plan: build & run
    
    Reviewers: bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D3366


>---------------------------------------------------------------

bdefa193d17314f8637622db81f32c55103ef942
 spectral/sphere/Makefile                               | 6 ------
 spectral/sphere/{spheres.slowppm => sphere.slowstdout} | 0
 spectral/sphere/{spheres.ppm => sphere.stdout}         | 0
 3 files changed, 6 deletions(-)

diff --git a/spectral/sphere/Makefile b/spectral/sphere/Makefile
index c735c0d..ae535ed 100644
--- a/spectral/sphere/Makefile
+++ b/spectral/sphere/Makefile
@@ -4,12 +4,6 @@ FAST_OPTS = 100
 NORM_OPTS = 100
 SLOW_OPTS = 200
 
-ifeq "$(mode)" "slow"
-SRC_RUNTEST_OPTS += -o1 spheres.slowppm
-else
-SRC_RUNTEST_OPTS += -o1 spheres.ppm
-endif
-
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/target.mk
 
diff --git a/spectral/sphere/spheres.slowppm b/spectral/sphere/sphere.slowstdout
similarity index 100%
rename from spectral/sphere/spheres.slowppm
rename to spectral/sphere/sphere.slowstdout
diff --git a/spectral/sphere/spheres.ppm b/spectral/sphere/sphere.stdout
similarity index 100%
rename from spectral/sphere/spheres.ppm
rename to spectral/sphere/sphere.stdout



More information about the ghc-commits mailing list