Changeset 2225 for trunk

Timestamp:

Jul 6, 2005, 6:34:23 AM (20 years ago)

Author:

bird

Message:

...

Location:

trunk/src/libctests/libc

Files:

• Makefile (modified) (6 diffs, 1 prop)
• smoketests/embryo-1.c (modified) (1 diff, 1 prop)

trunk/src/libctests/libc/Makefile

@@ -9 +9 @@
 #
 OUTDIR = ./out
-TS     = $(shell date '+"%Y-%m-%d-%H-%M-%S"')
+ABSOUTDIR = $(CURDIR)/out
+TS     = $(shell date '+%Y-%m-%d-%H-%M-%S')
 LOG    = $(OUTDIR)/$(1)-$(TS).log
 CC     = gcc
@@ -100 +101 @@
 smoketests/spm-1.c_LDFLAGS = -Zomf -static -lc_omf386
 #smoketests/embryo-1.c_DEPS = $(OUTDIR)/smoketests/asmstub.exe
-#smoketests/embryo-1.c_ARGS = $(OUTDIR)/smoketests/asmstub.exe
+#smoketests/embryo-1.c_ARGS = $(ABSOUTDIR)/smoketests/asmstub.exe
 smoketests/embryo-1.c_DEPS = $(OUTDIR)/smoketests/asmstub-omf.exe
-smoketests/embryo-1.c_ARGS = $(OUTDIR)/smoketests/asmstub-omf.exe
+smoketests/embryo-1.c_ARGS = $(ABSOUTDIR)/smoketests/asmstub-omf.exe
                         
 $(OUTDIR)/smoketests/asmstub.exe: smoketests/asmstub.S
@@ -130 +131 @@
 define def_simple
 
+$(eval _EXEC := $(strip $(if $($1_DIR),\
+        cd $($(1)_DIR) && LC_ALL=C $($1_ENVS) $(ABSOUTDIR)/$(2).exe $($1_ARGS),\
+        cd $(dir $(OUTDIR)/$2) && LC_ALL=C $($1_ENVS) $(notdir $2).exe $($1_ARGS))))
+
 $(OUTDIR)/$2.result: $1 $(OUTDIR)/$(dir $1).dir_created $($(1)_DEPS)
         @echo "########## $1"; \
-        echo  "##  BUILDING: $$(CC) $$(CFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<"; \
-        if $$(CC) $$(CFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<; then \
-                echo "##  RUNNING : LC_ALL=C $($1_ENVS) $(OUTDIR)/$2.exe $($1_ARGS) $(if $($(1)_INPUT), < $($(1)_INPUT),)"; \
-                if LC_ALL=C $($1_ENVS) $(OUTDIR)/$2.exe $($1_ARGS) $(if $($(1)_INPUT), < $($(1)_INPUT),); then\
+        echo  "##  BUILDING: $$(CC) $$(CFLAGS) $$(LDFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<"; \
+        if $$(CC) $$(CFLAGS) $$(LDFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<; then \
+                echo "##  RUNNING : ( $(_EXEC) )$(if $($(1)_INPUT), < $($(1)_INPUT))"; \
+                if ( $(_EXEC) )$(if $($(1)_INPUT), < $($(1)_INPUT)); then \
                         echo OK > $$@; \
                         printf "########## %-26s - SUCCESS\n" "$1"; \
@@ -145 +150 @@
         else \
                 echo "##  rc=$$$$? "; \
-                echo "##  $$(CC) $$(CFLAGS) -o $$@ $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<"; \
+                echo "##  $$(CC) $$(CFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<"; \
                 printf "########## %-26s - BUILD FAILURE\n" "$1";  \
-                echo "FAILURE - $$(CC) $$(CFLAGS) -o $$@ $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<" > $$@; \
+                echo "FAILURE - $$(CC) $$(CFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<" > $$@; \
         fi
         
@@ -162 +167 @@
         @printf "########## %-26s - SKIPPED\n" "$1"; \
         echo "SKIPPED" > $$@
-        
+
+$2: $(OUTDIR)/$2.result
+        @
+
 _TESTS += $(OUTDIR)/$2.result
 $(eval _$(TEST) += $(OUTDIR)/$2.result)
@@ -217 +225 @@
 tests-logged:
         @echo "**** logging to $(call LOG,test) ****"
+        @mkdir -p $(OUTDIR)
         -$(MAKE) tests 2>&1 | tee $(call LOG,test)
 

trunk/src/libctests/libc/smoketests/embryo-1.c

@@ -62 +62 @@
 
     printf("embryo-1: done\n");
-    sleep(10);
-    printf("embryo-1: exitting\n");
+    //sleep(10);
+    //printf("embryo-1: exitting\n");
     return 0;
 }