From 708022fbd2ddd6e91522cb9dd06f7fbf385fbf62 Mon Sep 17 00:00:00 2001
From: Kakadu <Kakadu@pm.me>
Date: Fri, 15 Nov 2024 21:28:01 +0300
Subject: [PATCH] Repair tests in stdlib/regression

Signed-off-by: Kakadu <Kakadu@pm.me>
---
 stdlib/regression/gen.ml   | 2 +-
 stdlib/regression/test01.t | 3 ++-
 stdlib/regression/test02.t | 3 ++-
 stdlib/regression/test03.t | 5 +++--
 stdlib/regression/test04.t | 3 ++-
 stdlib/regression/test05.t | 3 ++-
 stdlib/regression/test06.t | 3 ++-
 stdlib/regression/test07.t | 3 ++-
 stdlib/regression/test08.t | 3 ++-
 stdlib/regression/test09.t | 3 ++-
 stdlib/regression/test10.t | 3 ++-
 stdlib/regression/test11.t | 3 ++-
 stdlib/regression/test12.t | 3 ++-
 stdlib/regression/test13.t | 3 ++-
 stdlib/regression/test14.t | 3 ++-
 stdlib/regression/test15.t | 3 ++-
 stdlib/regression/test16.t | 3 ++-
 stdlib/regression/test17.t | 3 ++-
 stdlib/regression/test18.t | 3 ++-
 stdlib/regression/test20.t | 3 ++-
 stdlib/regression/test21.t | 3 ++-
 stdlib/regression/test22.t | 3 ++-
 stdlib/regression/test23.t | 3 ++-
 stdlib/regression/test24.t | 3 ++-
 stdlib/regression/test25.t | 3 ++-
 stdlib/regression/test26.t | 3 ++-
 stdlib/regression/test27.t | 3 ++-
 stdlib/regression/test28.t | 3 ++-
 stdlib/regression/test29.t | 3 ++-
 stdlib/regression/test32.t | 3 ++-
 stdlib/regression/test33.t | 3 ++-
 stdlib/regression/test34.t | 3 ++-
 32 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/stdlib/regression/gen.ml b/stdlib/regression/gen.ml
index dac68b071..d3b47d7a0 100644
--- a/stdlib/regression/gen.ml
+++ b/stdlib/regression/gen.ml
@@ -36,7 +36,7 @@ let () =
           if Sys.file_exists !lama_file && i <> 30 then (
             (* cram_printfn "  $ ls ../x64"; *)
             cram_printfn
-              "  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test%02d.lama -o test" i;
+              "  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test%02d.lama -o test | grep -v 'section .note.GNU-stack'" i;
             cram_printfn "  $ ./test";
             true)
           else   false
diff --git a/stdlib/regression/test01.t b/stdlib/regression/test01.t
index 066593f96..e6608a3c1 100644
--- a/stdlib/regression/test01.t
+++ b/stdlib/regression/test01.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test01.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test01.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Set internal structure: MNode (63, 1, 0, MNode (31, 1, 0, MNode (15, 1, 0, MNode (7, 1, 0, MNode (3, 1, 0, MNode (1, 1, 0, MNode (0, 1, 0, 0, 0), MNode (2, 1, 0, 0, 0)), MNode (5, 1, 0, MNode (4, 1, 0, 0, 0), MNode (6, 1, 0, 0, 0))), MNode (11, 1, 0, MNode (9, 1, 0, MNode (8, 1, 0, 0, 0), MNode (10, 1, 0, 0, 0)), MNode (13, 1, 0, MNode (12, 1, 0, 0, 0), MNode (14, 1, 0, 0, 0)))), MNode (23, 1, 0, MNode (19, 1, 0, MNode (17, 1, 0, MNode (16, 1, 0, 0, 0), MNode (18, 1, 0, 0, 0)), MNode (21, 1, 0, MNode (20, 1, 0, 0, 0), MNode (22, 1, 0, 0, 0))), MNode (27, 1, 0, MNode (25, 1, 0, MNode (24, 1, 0, 0, 0), MNode (26, 1, 0, 0, 0)), MNode (29, 1, 0, MNode (28, 1, 0, 0, 0), MNode (30, 1, 0, 0, 0))))), MNode (47, 1, 0, MNode (39, 1, 0, MNode (35, 1, 0, MNode (33, 1, 0, MNode (32, 1, 0, 0, 0), MNode (34, 1, 0, 0, 0)), MNode (37, 1, 0, MNode (36, 1, 0, 0, 0), MNode (38, 1, 0, 0, 0))), MNode (43, 1, 0, MNode (41, 1, 0, MNode (40, 1, 0, 0, 0), MNode (42, 1, 0, 0, 0)), MNode (45, 1, 0, MNode (44, 1, 0, 0, 0), MNode (46, 1, 0, 0, 0)))), MNode (55, 1, 0, MNode (51, 1, 0, MNode (49, 1, 0, MNode (48, 1, 0, 0, 0), MNode (50, 1, 0, 0, 0)), MNode (53, 1, 0, MNode (52, 1, 0, 0, 0), MNode (54, 1, 0, 0, 0))), MNode (59, 1, 0, MNode (57, 1, 0, MNode (56, 1, 0, 0, 0), MNode (58, 1, 0, 0, 0)), MNode (61, 1, 0, MNode (60, 1, 0, 0, 0), MNode (62, 1, 0, 0, 0)))))), MNode (79, 1, -1, MNode (71, 1, 0, MNode (67, 1, 0, MNode (65, 1, 0, MNode (64, 1, 0, 0, 0), MNode (66, 1, 0, 0, 0)), MNode (69, 1, 0, MNode (68, 1, 0, 0, 0), MNode (70, 1, 0, 0, 0))), MNode (75, 1, 0, MNode (73, 1, 0, MNode (72, 1, 0, 0, 0), MNode (74, 1, 0, 0, 0)), MNode (77, 1, 0, MNode (76, 1, 0, 0, 0), MNode (78, 1, 0, 0, 0)))), MNode (87, 1, -1, MNode (83, 1, 0, MNode (81, 1, 0, MNode (80, 1, 0, 0, 0), MNode (82, 1, 0, 0, 0)), MNode (85, 1, 0, MNode (84, 1, 0, 0, 0), MNode (86, 1, 0, 0, 0))), MNode (95, 1, 0, MNode (91, 1, 0, MNode (89, 1, 0, MNode (88, 1, 0, 0, 0), MNode (90, 1, 0, 0, 0)), MNode (93, 1, 0, MNode (92, 1, 0, 0, 0), MNode (94, 1, 0, 0, 0))), MNode (97, 1, -1, MNode (96, 1, 0, 0, 0), MNode (98, 1, -1, 0, MNode (99, 1, 0, 0, 0)))))))
   Set elements: {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99}
diff --git a/stdlib/regression/test02.t b/stdlib/regression/test02.t
index 60fb8a8c0..8195f5589 100644
--- a/stdlib/regression/test02.t
+++ b/stdlib/regression/test02.t
@@ -1,6 +1,7 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test02.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test02.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Assn ("x", Dec ("3"))
diff --git a/stdlib/regression/test03.t b/stdlib/regression/test03.t
index 9f54617f8..ed1f427d9 100644
--- a/stdlib/regression/test03.t
+++ b/stdlib/regression/test03.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test03.lama -o test
-  /usr/bin/ld: warning: /tmp/build_f976a4_dune/ccZxTdzd.o: missing .note.GNU-stack section implies executable stack
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test03.lama -o test | grep -v 'section .note.GNU-stack'
+  /usr/bin/ld: warning: /tmp/build_7bb8d6_dune/ccQnDDog.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   -1
   1
diff --git a/stdlib/regression/test04.t b/stdlib/regression/test04.t
index c386552c3..04c83f887 100644
--- a/stdlib/regression/test04.t
+++ b/stdlib/regression/test04.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test04.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test04.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Map internal structure: MNode (63, {630}, 0, MNode (31, {310}, 0, MNode (15, {150}, 0, MNode (7, {70}, 0, MNode (3, {30}, 0, MNode (1, {10}, 0, MNode (0, {0}, 0, 0, 0), MNode (2, {20}, 0, 0, 0)), MNode (5, {50}, 0, MNode (4, {40}, 0, 0, 0), MNode (6, {60}, 0, 0, 0))), MNode (11, {110}, 0, MNode (9, {90}, 0, MNode (8, {80}, 0, 0, 0), MNode (10, {100}, 0, 0, 0)), MNode (13, {130}, 0, MNode (12, {120}, 0, 0, 0), MNode (14, {140}, 0, 0, 0)))), MNode (23, {230}, 0, MNode (19, {190}, 0, MNode (17, {170}, 0, MNode (16, {160}, 0, 0, 0), MNode (18, {180}, 0, 0, 0)), MNode (21, {210}, 0, MNode (20, {200}, 0, 0, 0), MNode (22, {220}, 0, 0, 0))), MNode (27, {270}, 0, MNode (25, {250}, 0, MNode (24, {240}, 0, 0, 0), MNode (26, {260}, 0, 0, 0)), MNode (29, {290}, 0, MNode (28, {280}, 0, 0, 0), MNode (30, {300}, 0, 0, 0))))), MNode (47, {470}, 0, MNode (39, {390}, 0, MNode (35, {350}, 0, MNode (33, {330}, 0, MNode (32, {320}, 0, 0, 0), MNode (34, {340}, 0, 0, 0)), MNode (37, {370}, 0, MNode (36, {360}, 0, 0, 0), MNode (38, {380}, 0, 0, 0))), MNode (43, {430}, 0, MNode (41, {410}, 0, MNode (40, {400}, 0, 0, 0), MNode (42, {420}, 0, 0, 0)), MNode (45, {450}, 0, MNode (44, {440}, 0, 0, 0), MNode (46, {460}, 0, 0, 0)))), MNode (55, {550}, 0, MNode (51, {510}, 0, MNode (49, {490}, 0, MNode (48, {480}, 0, 0, 0), MNode (50, {500}, 0, 0, 0)), MNode (53, {530}, 0, MNode (52, {520}, 0, 0, 0), MNode (54, {540}, 0, 0, 0))), MNode (59, {590}, 0, MNode (57, {570}, 0, MNode (56, {560}, 0, 0, 0), MNode (58, {580}, 0, 0, 0)), MNode (61, {610}, 0, MNode (60, {600}, 0, 0, 0), MNode (62, {620}, 0, 0, 0)))))), MNode (79, {790}, -1, MNode (71, {710}, 0, MNode (67, {670}, 0, MNode (65, {650}, 0, MNode (64, {640}, 0, 0, 0), MNode (66, {660}, 0, 0, 0)), MNode (69, {690}, 0, MNode (68, {680}, 0, 0, 0), MNode (70, {700}, 0, 0, 0))), MNode (75, {750}, 0, MNode (73, {730}, 0, MNode (72, {720}, 0, 0, 0), MNode (74, {740}, 0, 0, 0)), MNode (77, {770}, 0, MNode (76, {760}, 0, 0, 0), MNode (78, {780}, 0, 0, 0)))), MNode (87, {870}, -1, MNode (83, {830}, 0, MNode (81, {810}, 0, MNode (80, {800}, 0, 0, 0), MNode (82, {820}, 0, 0, 0)), MNode (85, {850}, 0, MNode (84, {840}, 0, 0, 0), MNode (86, {860}, 0, 0, 0))), MNode (95, {950}, 0, MNode (91, {910}, 0, MNode (89, {890}, 0, MNode (88, {880}, 0, 0, 0), MNode (90, {900}, 0, 0, 0)), MNode (93, {930}, 0, MNode (92, {920}, 0, 0, 0), MNode (94, {940}, 0, 0, 0))), MNode (97, {970}, -1, MNode (96, {960}, 0, 0, 0), MNode (98, {980}, -1, 0, MNode (99, {990}, 0, 0, 0)))))))
   Map elements: {[0, 0], [1, 10], [2, 20], [3, 30], [4, 40], [5, 50], [6, 60], [7, 70], [8, 80], [9, 90], [10, 100], [11, 110], [12, 120], [13, 130], [14, 140], [15, 150], [16, 160], [17, 170], [18, 180], [19, 190], [20, 200], [21, 210], [22, 220], [23, 230], [24, 240], [25, 250], [26, 260], [27, 270], [28, 280], [29, 290], [30, 300], [31, 310], [32, 320], [33, 330], [34, 340], [35, 350], [36, 360], [37, 370], [38, 380], [39, 390], [40, 400], [41, 410], [42, 420], [43, 430], [44, 440], [45, 450], [46, 460], [47, 470], [48, 480], [49, 490], [50, 500], [51, 510], [52, 520], [53, 530], [54, 540], [55, 550], [56, 560], [57, 570], [58, 580], [59, 590], [60, 600], [61, 610], [62, 620], [63, 630], [64, 640], [65, 650], [66, 660], [67, 670], [68, 680], [69, 690], [70, 700], [71, 710], [72, 720], [73, 730], [74, 740], [75, 750], [76, 760], [77, 770], [78, 780], [79, 790], [80, 800], [81, 810], [82, 820], [83, 830], [84, 840], [85, 850], [86, 860], [87, 870], [88, 880], [89, 890], [90, 900], [91, 910], [92, 920], [93, 930], [94, 940], [95, 950], [96, 960], [97, 970], [98, 980], [99, 990]}
diff --git a/stdlib/regression/test05.t b/stdlib/regression/test05.t
index 800e89773..5f548f860 100644
--- a/stdlib/regression/test05.t
+++ b/stdlib/regression/test05.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test05.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test05.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Cached: 1
   Cached: 1
diff --git a/stdlib/regression/test06.t b/stdlib/regression/test06.t
index 69841c6b4..81937ce94 100644
--- a/stdlib/regression/test06.t
+++ b/stdlib/regression/test06.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test06.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test06.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Flattening: 0
   Flattening: {0, 0, 0, 0}
diff --git a/stdlib/regression/test07.t b/stdlib/regression/test07.t
index 82d280a77..93345c0f3 100644
--- a/stdlib/regression/test07.t
+++ b/stdlib/regression/test07.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test07.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test07.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   HashTab internal structure: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {[{1, 2, 3}, 100]}, 0, 0, 0]
   HashTab internal structure: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {[{1, 2, 3}, 200], [{1, 2, 3}, 100]}, 0, 0, 0]
diff --git a/stdlib/regression/test08.t b/stdlib/regression/test08.t
index b8eeaa3b2..3f18df7a8 100644
--- a/stdlib/regression/test08.t
+++ b/stdlib/regression/test08.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test08.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test08.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   6
   120
diff --git a/stdlib/regression/test09.t b/stdlib/regression/test09.t
index a1de77a28..5ea755e1f 100644
--- a/stdlib/regression/test09.t
+++ b/stdlib/regression/test09.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test09.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test09.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Parsing a*| against "aa"... Succ ({"a", "a"})
   Parsing a+| against "aa"... Succ ({"a", "a"})
diff --git a/stdlib/regression/test10.t b/stdlib/regression/test10.t
index 9afaea8e7..f4f59408f 100644
--- a/stdlib/regression/test10.t
+++ b/stdlib/regression/test10.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test10.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test10.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Parsing "aaa" with many ... Succ ({"a", "a", "a"})
   Parsing "ab" with bad_alter ... Succ ("ab")
diff --git a/stdlib/regression/test11.t b/stdlib/regression/test11.t
index 1df7b0a3b..cca5b2379 100644
--- a/stdlib/regression/test11.t
+++ b/stdlib/regression/test11.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test11.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test11.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Succ ("a")
   Succ (Add ("a", "a"))
diff --git a/stdlib/regression/test12.t b/stdlib/regression/test12.t
index 2cb0057a0..dd2ef84bd 100644
--- a/stdlib/regression/test12.t
+++ b/stdlib/regression/test12.t
@@ -1,6 +1,7 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test12.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test12.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Succ (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul (Mul ("a", "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"), "a"))
diff --git a/stdlib/regression/test13.t b/stdlib/regression/test13.t
index c8c7e9644..cc800a0ed 100644
--- a/stdlib/regression/test13.t
+++ b/stdlib/regression/test13.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test13.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test13.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Succ (Add ("a", Sub ("a", "a")))
   Succ (Mul (Div (Mul ("a", "a"), "a"), "a"))
diff --git a/stdlib/regression/test14.t b/stdlib/regression/test14.t
index 14f3f4f32..831ce7f37 100644
--- a/stdlib/regression/test14.t
+++ b/stdlib/regression/test14.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test14.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test14.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Succ (Add ("a", Sub ("a", "a")))
   Succ (Mul (Div (Mul ("a", "a"), "a"), "a"))
diff --git a/stdlib/regression/test15.t b/stdlib/regression/test15.t
index 50207a808..f9c4389ea 100644
--- a/stdlib/regression/test15.t
+++ b/stdlib/regression/test15.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test15.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test15.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Succ (Eq ("a", "a"))
   Succ (Eq (Mul ("a", "a"), Mul ("a", "a")))
diff --git a/stdlib/regression/test16.t b/stdlib/regression/test16.t
index 7045f2b87..48a57df84 100644
--- a/stdlib/regression/test16.t
+++ b/stdlib/regression/test16.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test16.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test16.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Succ (Eq ("a", "a"))
   Succ (Eq ("b", "b"))
diff --git a/stdlib/regression/test17.t b/stdlib/regression/test17.t
index 0884e2464..9dfb72d66 100644
--- a/stdlib/regression/test17.t
+++ b/stdlib/regression/test17.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test17.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test17.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Lazy body: 0
   Lazy body: 1
diff --git a/stdlib/regression/test18.t b/stdlib/regression/test18.t
index 6966aeb4b..130197cfb 100644
--- a/stdlib/regression/test18.t
+++ b/stdlib/regression/test18.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test18.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test18.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   1 =?= 1 = 0
   symmetricity: ok
diff --git a/stdlib/regression/test20.t b/stdlib/regression/test20.t
index 6093ea6ce..dd3aabf69 100644
--- a/stdlib/regression/test20.t
+++ b/stdlib/regression/test20.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test20.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test20.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Empty
   Node (0, Empty, Empty)
diff --git a/stdlib/regression/test21.t b/stdlib/regression/test21.t
index cbe8fa061..2bccc8c06 100644
--- a/stdlib/regression/test21.t
+++ b/stdlib/regression/test21.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test21.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test21.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   1
   1
diff --git a/stdlib/regression/test22.t b/stdlib/regression/test22.t
index 302c8b42e..3db91fbda 100644
--- a/stdlib/regression/test22.t
+++ b/stdlib/regression/test22.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test22.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test22.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   0
   {1, 2, 3, 4}
diff --git a/stdlib/regression/test23.t b/stdlib/regression/test23.t
index e32d2cda0..df1ada7e3 100644
--- a/stdlib/regression/test23.t
+++ b/stdlib/regression/test23.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test23.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test23.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   1
   {2, 3, 4}
diff --git a/stdlib/regression/test24.t b/stdlib/regression/test24.t
index ba7a813b2..ac12ce93e 100644
--- a/stdlib/regression/test24.t
+++ b/stdlib/regression/test24.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test24.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test24.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   3
   {1}
diff --git a/stdlib/regression/test25.t b/stdlib/regression/test25.t
index 7eba62fa7..d9683636e 100644
--- a/stdlib/regression/test25.t
+++ b/stdlib/regression/test25.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test25.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test25.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Cloning int: 5
   Cloning string: abc
diff --git a/stdlib/regression/test26.t b/stdlib/regression/test26.t
index 19d7efaba..dbbafb651 100644
--- a/stdlib/regression/test26.t
+++ b/stdlib/regression/test26.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test26.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test26.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Number of commands-line arguments: 1
     arg [0 ] = "./test"
diff --git a/stdlib/regression/test27.t b/stdlib/regression/test27.t
index 681f8fe00..44a7a5d6a 100644
--- a/stdlib/regression/test27.t
+++ b/stdlib/regression/test27.t
@@ -1,6 +1,7 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test27.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test27.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Yes
diff --git a/stdlib/regression/test28.t b/stdlib/regression/test28.t
index 046c9013c..75c6bdb61 100644
--- a/stdlib/regression/test28.t
+++ b/stdlib/regression/test28.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test28.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test28.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Succ (Seq ("a", "b"))
   Succ (Alt ("a"))
diff --git a/stdlib/regression/test29.t b/stdlib/regression/test29.t
index 817c348bb..7d0574065 100644
--- a/stdlib/regression/test29.t
+++ b/stdlib/regression/test29.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test29.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test29.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Succ (Seq ("a", "b"))
   Succ (Alt ("a"))
diff --git a/stdlib/regression/test32.t b/stdlib/regression/test32.t
index b960de917..5345e72c2 100644
--- a/stdlib/regression/test32.t
+++ b/stdlib/regression/test32.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test32.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test32.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   Flattening: 0
   Flattening: {A, B, C, D}
diff --git a/stdlib/regression/test33.t b/stdlib/regression/test33.t
index 396e040bd..879b9f7a0 100644
--- a/stdlib/regression/test33.t
+++ b/stdlib/regression/test33.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test33.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test33.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
   {}.string: 0
   {}.stringcat: 
diff --git a/stdlib/regression/test34.t b/stdlib/regression/test34.t
index bf7a37ba0..a62a75060 100644
--- a/stdlib/regression/test34.t
+++ b/stdlib/regression/test34.t
@@ -1,7 +1,8 @@
 This file was autogenerated.
-  $ LAMA=../../runtime ../../src/Driver.exe -I ../x64 -ds -dp test34.lama -o test
+  $ ../../src/Driver.exe -runtime ../../runtime -I ../../runtime -I ../../stdlib/x64 -ds -dp test34.lama -o test | grep -v 'section .note.GNU-stack'
   /usr/bin/ld: warning: printf.o: missing .note.GNU-stack section implies executable stack
   /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  [1]
   $ ./test
    ' " ` % \ \r 
   	 \h @ $ # ; [ ]