Hassan Al-Awwadi pushed to branch wip/haanss/depdir at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • testsuite/tests/th/Makefile
    ... ... @@ -55,25 +55,25 @@ TH_Depends_Dir:
    55 55
     	mkdir DONT_TRIGGER_RECOMP
    
    56 56
     
    
    57 57
     # First build with an empty dependent directory
    
    58
    -	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package template-haskell -v0 TH_Depends_Dir
    
    58
    +	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package directory -package template-haskell -v0 TH_Depends_Dir
    
    59 59
     	./TH_Depends_Dir
    
    60 60
     	
    
    61 61
     # Create a file in the dependent directory to trigger recompilation
    
    62 62
     	sleep 2
    
    63 63
     	echo "dummy" > TRIGGER_RECOMP/dummy.txt
    
    64
    -	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package template-haskell -v0 TH_Depends_Dir
    
    64
    +	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package directory -package template-haskell -v0 TH_Depends_Dir
    
    65 65
     	./TH_Depends_Dir
    
    66 66
     	
    
    67 67
     # Remove the file to check that recompilation is triggered
    
    68 68
     	sleep 2
    
    69 69
     	$(RM) TRIGGER_RECOMP/dummy.txt
    
    70
    -	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package template-haskell -v0 TH_Depends_Dir
    
    70
    +	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package directory -package template-haskell -v0 TH_Depends_Dir
    
    71 71
     	./TH_Depends_Dir
    
    72 72
     
    
    73 73
     # Should not trigger recompilation
    
    74 74
     	sleep 2
    
    75 75
     	echo "dummy" > DONT_TRIGGER_RECOMP/dummy.txt
    
    76
    -	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package template-haskell -v0 TH_Depends_Dir
    
    76
    +	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package directory -package template-haskell -v0 TH_Depends_Dir
    
    77 77
     	./TH_Depends_Dir
    
    78 78
     
    
    79 79
     # Should trigger a recompilation. Note that we should also see the change
    
    ... ... @@ -81,7 +81,7 @@ TH_Depends_Dir:
    81 81
     # as we recompile, it just doesn't *trigger* a recompilation.
    
    82 82
     	sleep 2
    
    83 83
     	rm -rf TRIGGER_RECOMP
    
    84
    -	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package template-haskell -v0 TH_Depends_Dir
    
    84
    +	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -package directory -package template-haskell -v0 TH_Depends_Dir
    
    85 85
     	./TH_Depends_Dir
    
    86 86
     
    
    87 87
     T8333: