Exception test fix, exit code tests for Windows

Author: lwerdna

test.py

@@ -389,13 +389,18 @@ def thread_task():
 
 		fpath = testbin_to_fpath()
 
-		for (arg, expected) in [('-11',245), ('-1',255), ('-3',253), ('0',0), ('3',3), ('7',7), ('123',123)]:
+		# some systems return byte, or low byte of 32-bit code and otheres return 32-bit code
+		testvals = [('-11',[245,4294967285]), ('-1',[4294967295,255]), ('-3',[4294967293,253]), ('0',[0]), ('3',[3]), ('7',[7]), ('123',[123])]
+		for (arg, expected) in testvals:
 			adapter = DebugAdapter.get_adapter_for_current_system()
+			adapter.setup()
+
 			utils.green('testing %s %s' % (tb, arg))
 			adapter.exec(fpath, [arg])
 			(reason, extra) = go_initial(adapter)
 			assert_equality(reason, DebugAdapter.STOP_REASON.PROCESS_EXITED)
-			assert_equality(extra, expected)
+			if not extra in expected:
+				raise Exception('expected return code %d to be in %s' % (extra, expected))
 
 	# exception test
 	for tb in testbins:

testbins/Makefile-win32

@@ -1,6 +1,6 @@
 # nmake -f Makefile-win32 from within "x86 Native Tools Command Prompt"
 
-TARGETS_ALL = helloworld_x86-windows.exe helloworld_loop_x86-windows.exe helloworld_thread_x86-windows.exe helloworld_func_x86-windows.exe helloworld_pie_x86-windows.exe helloworld_loop_pie_x86-windows.exe helloworld_thread_pie_x86-windows.exe helloworld_func_pie_x86-windows.exe asmtest_x86-windows.exe do_exception_pie_x86-windows.exe 
+TARGETS_ALL = helloworld_x86-windows.exe exitcode_x86-windows.exe helloworld_loop_x86-windows.exe helloworld_thread_x86-windows.exe helloworld_func_x86-windows.exe helloworld_pie_x86-windows.exe helloworld_loop_pie_x86-windows.exe helloworld_thread_pie_x86-windows.exe helloworld_func_pie_x86-windows.exe asmtest_x86-windows.exe do_exception_pie_x86-windows.exe 
 
 all: $(TARGETS_ALL)
 
@@ -10,6 +10,9 @@ clean:
 helloworld_x86-windows.exe: helloworld.c
 	cl helloworld.c /Fe:helloworld_x86-windows.exe /link /DYNAMICBASE:NO
 
+exitcode_x86-windows.exe: exitcode.c
+	cl exitcode.c /Fe:exitcode_x86-windows.exe /link /DYNAMICBASE:NO
+
 helloworld_thread_x86-windows.exe: helloworld_thread.c
 	cl helloworld_thread.c /Fe:helloworld_thread_x86-windows.exe /link /DYNAMICBASE:NO
 

testbins/Makefile-win64

@@ -1,6 +1,6 @@
 # nmake -f Makefile-win64 from within "x64 Native Tools Command Prompt"
 
-TARGETS_ALL = helloworld_x64-windows.exe helloworld_loop_x64-windows.exe helloworld_thread_x64-windows.exe helloworld_func_x64-windows.exe helloworld_pie_x64-windows.exe helloworld_loop_pie_x64-windows.exe helloworld_thread_pie_x64-windows.exe helloworld_func_pie_x64-windows.exe asmtest_x64-windows.exe do_exception_pie_x64-windows.exe
+TARGETS_ALL = helloworld_x64-windows.exe exitcode_x64-windows.exe helloworld_loop_x64-windows.exe helloworld_thread_x64-windows.exe helloworld_func_x64-windows.exe helloworld_pie_x64-windows.exe helloworld_loop_pie_x64-windows.exe helloworld_thread_pie_x64-windows.exe helloworld_func_pie_x64-windows.exe asmtest_x64-windows.exe do_exception_pie_x64-windows.exe
 
 all: $(TARGETS_ALL)
 
@@ -10,6 +10,9 @@ clean:
 helloworld_x64-windows.exe: helloworld.c
 	cl helloworld.c /Fe:helloworld_x64-windows.exe /link /DYNAMICBASE:NO
 
+exitcode_x64-windows.exe: exitcode.c
+	cl exitcode.c /Fe:exitcode_x64-windows.exe /link /DYNAMICBASE:NO
+
 helloworld_thread_x64-windows.exe: helloworld_thread.c
 	cl helloworld_thread.c /Fe:helloworld_thread_x64-windows.exe /link /DYNAMICBASE:NO
 
@@ -32,7 +35,7 @@ helloworld_func_pie_x64-windows.exe: helloworld_func.c
 	cl helloworld_func.c /Fe:helloworld_func_pie_x64-windows.exe /link
 
 do_exception_pie_x64-windows.exe: do_exception.c
-	cl do_exception.c /Fe:do_exception_pie_x64-windows.exe /link
+	cl do_exception.c -DARCH_IS_X64 /Fe:do_exception_pie_x64-windows.exe /link
 
 asmtest_x64-windows.exe: asmtest_x64-windows.obj
 	link asmtest_x64-windows.obj /ENTRY:WinMain /SUBSYSTEM:CONSOLE /LARGEADDRESSAWARE:NO /DYNAMICBASE:NO /OUT:asmtest_x64-windows.exe kernel32.lib