Generalise the integerToInt_smallInteger test (now fromToInteger)

testsuite/tests/lib/integer/Makefile

@@ -36,10 +36,12 @@ integerConstantFolding:
 	$(call CHECK,\<400280.0\>,encodeIntegerFloat)
 	./integerConstantFolding
 
-.PHONY: integerToInt_smallInteger
-integerToInt_smallInteger:
-	'$(TEST_HC)' -Wall -v0 -O -c integerToInt_smallInteger.hs -fforce-recomp -ddump-simpl > integerToInt_smallInteger.simpl
-# Rules should eliminate both functions
-	-grep integerToInt integerToInt_smallInteger.simpl
-	-grep smallInteger integerToInt_smallInteger.simpl
+.PHONY: fromToInteger
+fromToInteger:
+	'$(TEST_HC)' -Wall -v0 -O -c fromToInteger.hs -fforce-recomp -ddump-simpl > fromToInteger.simpl
+# Rules should eliminate all functions
+	-grep integerToInt fromToInteger.simpl
+	-grep smallInteger fromToInteger.simpl
+	-grep integerToWord fromToInteger.simpl
+	-grep wordToInteger fromToInteger.simpl
 

testsuite/tests/lib/integer/all.T

@@ -4,8 +4,8 @@ test('integerConstantFolding',
      extra_clean(['integerConstantFolding.simpl']),
      run_command,
      ['$MAKE -s --no-print-directory integerConstantFolding'])
-test('integerToInt_smallInteger',
-     extra_clean(['integerToInt_smallInteger.simpl']),
+test('fromToInteger',
+     extra_clean(['fromToInteger.simpl']),
      run_command,
-     ['$MAKE -s --no-print-directory integerToInt_smallInteger'])
+     ['$MAKE -s --no-print-directory fromToInteger'])
 

testsuite/tests/lib/integer/integerToInt_smallInteger.hs → testsuite/tests/lib/integer/fromToInteger.hs

@@ -9,3 +9,6 @@ import GHC.Integer
 v :: Int
 v = I# (integerToInt (smallInteger 3#))
 
+w :: Word
+w = W# (integerToWord (wordToInteger 3##))
+