Commit cc4a5ce4 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Fix cleaning annrun01

parent e7841b85
...@@ -4,12 +4,9 @@ include $(TOP)/mk/test.mk ...@@ -4,12 +4,9 @@ include $(TOP)/mk/test.mk
CONFIG_HS=Config.hs CONFIG_HS=Config.hs
clean :
rm -f $(CONFIG_HS)
config : config :
rm -f $(CONFIG_HS) rm -f $(CONFIG_HS)
@echo "Creating $(CONFIG_HS) ... " @echo "Creating $(CONFIG_HS) ... "
@echo "module Config where" >>$(CONFIG_HS) echo "module Config where" >>$(CONFIG_HS)
@echo "cTop :: String" >> $(CONFIG_HS) echo "cTop :: String" >> $(CONFIG_HS)
@echo "cTop = \""`$(TEST_HC) --print-libdir`"\"" >> $(CONFIG_HS) echo "cTop = \""`$(TEST_HC) --print-libdir`"\"" >> $(CONFIG_HS)
\ No newline at end of file \ No newline at end of file
...@@ -8,16 +8,14 @@ setTestOpts(compose(skip_if_fast, if_compiler_lt('ghc', '6.11', skip))); ...@@ -8,16 +8,14 @@ setTestOpts(compose(skip_if_fast, if_compiler_lt('ghc', '6.11', skip)));
# now, just disable the profiling ways. # now, just disable the profiling ways.
test('annrun01', test('annrun01',
[extra_clean(['Annrun01_Help.hi', 'Annrun01_Help.o', [extra_clean(['Annrun01_Help.hi', 'Annrun01_Help.o',
'annrun01.hi', 'annrun01.o']), 'annrun01.hi', 'annrun01.o',
pre_cmd('$MAKE config'), 'Config.hs', 'Config.hi', 'Config.o']),
pre_cmd('$MAKE -s config'),
omit_ways(['profc','profasm','profthreaded'])], omit_ways(['profc','profasm','profthreaded'])],
multimod_compile_and_run, multimod_compile_and_run,
['annrun01', '-package ghc'] ['annrun01', '-package ghc']
) )
if default_testopts.cleanup != '':
runCmd('$MAKE -C ' + in_testdir('') + ' clean')
"""" """"
Helpful things to C+P: Helpful things to C+P:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment