[Git][ghc/ghc][wip/T24744] Fix tests

[Serge S. Gulin (@gulin.serge)]

Serge S. Gulin pushed to branch wip/T24744 at Glasgow Haskell Compiler / GHC


Commits:
f92ed806 by Serge S. Gulin at 2024-11-25T20:49:23+03:00
Fix tests

- - - - -


7 changed files:

- compiler/GHC/StgToJS/Apply.hs
- testsuite/tests/javascript/Makefile
- testsuite/tests/javascript/T23479_1.hs → testsuite/tests/javascript/T23479.hs
- testsuite/tests/javascript/T23479_1.stdout → testsuite/tests/javascript/T23479.stdout
- testsuite/tests/javascript/T23479_2.hs → testsuite/tests/javascript/T24744.hs
- testsuite/tests/javascript/T23479_2.stdout → testsuite/tests/javascript/T24744.stdout
- testsuite/tests/javascript/all.T


Changes:

=====================================
compiler/GHC/StgToJS/Apply.hs
=====================================
@@ -100,7 +100,7 @@ genApp
   -> [StgArg]
   -> G (JStgStat, ExprResult)
 genApp ctx i args
-    -- Test case T23479_1
+    -- Test case T23479
     | [StgLitArg (LitString bs)] <- args
     , Just d <- decodeModifiedUTF8 bs
     , idName i == unsafeUnpackJSStringUtf8ShShName


=====================================
testsuite/tests/javascript/Makefile
=====================================
@@ -13,20 +13,20 @@ T24495:
 	# check that the optimization occurred for -02 1 time (1 for unfloated lits)
 	grep -c appendToHsStringA T24495.dump-js
 
-T23479_1:
-	'$(TEST_HC)' $(TEST_HC_OPTS) T23479_1.hs -v0 -O2 -dsuppress-uniques -ddump-js -ddump-to-file
-	./T23479_1
+T23479:
+	'$(TEST_HC)' $(TEST_HC_OPTS) T23479.hs -v0 -O2 -dsuppress-uniques -ddump-js -ddump-to-file
+	./T23479
 	# check that the optimization occurred
-	grep -c "h\$$r1 = \"test_val_1\"" T23479_1.dump-js
-	grep -c "h\$$r1 = \"test_val_2\"" T23479_1.dump-js
-	grep -c "h\$$r1 = \"test_val_3\"" T23479_1.dump-js
-	grep -c "h\$$r1 = \"test_val_80_local" T23479_1.dump-js
-	grep -c "h\$$r1 = \"test_val_80_global" T23479_1.dump-js || true
+	grep -c "h\$$r1 = \"test_val_1\"" T23479.dump-js
+	grep -c "h\$$r1 = \"test_val_2\"" T23479.dump-js
+	grep -c "h\$$r1 = \"test_val_3\"" T23479.dump-js
+	grep -c "h\$$r1 = \"test_val_80_local" T23479.dump-js
+	grep -c "h\$$r1 = \"test_val_80_global" T23479.dump-js || true
 
-T23479_2:
-	'$(TEST_HC)' $(TEST_HC_OPTS) T23479_2.hs -v0 -O2 -dsuppress-uniques -ddump-js -ddump-to-file
-	./T23479_2
-	grep -c "h\$$r1 = \"test_val_1\"" T23479_2.dump-js
-	grep -c "h\$$r1 = \"test_val_80_local_once" T23479_2.dump-js
+T24744:
+	'$(TEST_HC)' $(TEST_HC_OPTS) T24744.hs -v0 -O2 -dsuppress-uniques -ddump-js -ddump-to-file
+	./T24744
+	grep -c "h\$$r1 = \"test_val_1\"" T24744.dump-js
+	grep -c "h\$$r1 = \"test_val_80_local_once" T24744.dump-js
 	# check that the optimization occurred
-	grep -c "h\$$r1 = h\$$decodeUtf8z" T23479_2.dump-js
+	grep -c "h\$$r1 = h\$$decodeUtf8z" T24744.dump-js


=====================================
testsuite/tests/javascript/T23479_1.hs → testsuite/tests/javascript/T23479.hs
=====================================


=====================================
testsuite/tests/javascript/T23479_1.stdout → testsuite/tests/javascript/T23479.stdout
=====================================


=====================================
testsuite/tests/javascript/T23479_2.hs → testsuite/tests/javascript/T24744.hs
=====================================


=====================================
testsuite/tests/javascript/T23479_2.stdout → testsuite/tests/javascript/T24744.stdout
=====================================


=====================================
testsuite/tests/javascript/all.T
=====================================
@@ -23,5 +23,5 @@ test('T22455', normal, compile_and_run, ['-ddisable-js-minifier'])
 test('T23565', normal, compile_and_run, [''])
 test('T24495', normal, makefile_test, ['T24495'])
 
-test('T23479_1', normal, makefile_test, ['T23479_1'])
-test('T23479_2', normal, makefile_test, ['T23479_2'])
+test('T23479', normal, makefile_test, ['T23479'])
+test('T24744', normal, makefile_test, ['T24744'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f92ed806c8f300860e6930c34aac7d81647b5a5f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f92ed806c8f300860e6930c34aac7d81647b5a5f
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241125/eb3d42aa/attachment-0001.html>