Changeset 21449

Timestamp:

Sep 19, 2010, 8:59:38 PM (15 years ago)

Author:

dmik

Message:

testapp: Added test case for for try/finally/leave.

Location:

trunk/testapp

Files:

• common.mak (modified) (2 diffs)
• exceptions/seh/Makefile (modified) (1 diff)
• exceptions/seh/except.c (moved) (moved from trunk/testapp/exceptions/seh/test.c )
• exceptions/seh/finally.c (added)

trunk/testapp/common.mak ¶

@@ -23 +23 @@
 
 run-%: %
-        @echo [Running $<]
+        @echo [Running $<$(if $($<_ARGS), $($<_ARGS))]
         @echo.
-        @cmd /c "set BEGINLIBPATH=$(ODIN_DOS)/bin/Debug;$(ODIN_DOS)/bin;%BEGINLIBPATH% && $<"
+        @cmd /c "set BEGINLIBPATH=$(ODIN_DOS)/bin/Debug;$(ODIN_DOS)/bin;%BEGINLIBPATH% && $< $($<_ARGS)"
+        @echo.
 
 debug-%: %
-        @echo [Debugging $<]
+        @echo [Running $<$(if $($<_ARGS), $($<_ARGS))]
         @echo.
-        @cmd /c "set BEGINLIBPATH=$(ODIN_DOS)/bin/Debug;$(ODIN_DOS)/bin;%BEGINLIBPATH% && $(DEBUGGER) $<"
+        @cmd /c "set BEGINLIBPATH=$(ODIN_DOS)/bin/Debug;$(ODIN_DOS)/bin;%BEGINLIBPATH% && $(DEBUGGER) $< $($<_ARGS)"
+        @echo.
         
 %.exe: %.c
@@ -42 +44 @@
 clean::
         -rm $(CLEAN)
+
+define run-with-args-gen
+.PHONY: run-$(1)-$(2) run-$(1)-$(3)
+run-$(1)-$(2): $(1)
+        @make -s run-$(1) $(1)_ARGS=$($(1)_ARGS.$(2))
+run-$(1)-$(3):: run-$(1)-$(2)
+endef
+
+run-with-args = $(foreach i, $(2), $(eval $(call run-with-args-gen,$(1),$(i),$(3))))run-$(1)-$(3)

trunk/testapp/exceptions/seh/Makefile ¶

@@ -3 +3 @@
 include $(ODIN)/testapp/common.mak
 
-all: test.exe # test.s
+all: except.exe finally.exe # except.s
 
-run: run-test.exe
+finally.exe_ARGS.1 = 1
+finally.exe_ARGS.2 = 2
+finally.exe_ARGS.3 = 3
+
+run: run-except.exe $(call run-with-args,finally.exe,1 2 3,all)
 
 CLEAN += *.s