temp

Author: grisumbras

fuzzing/Jamfile

@@ -42,6 +42,7 @@ local corpus.tar = [ glob-ex . : corpus.tar ] ;
 local test-corpus ;
 if $(corpus.tar)
 {
+    echo Using old corpus ;
     # if an old corpus exists, use it
     make old-corpus
         : $(corpus.tar)
@@ -56,7 +57,7 @@ else
 }
 
 local old-runs = [ SORT [ glob-tree-ex old_crashes : * ] ] ;
-make old_crashes : : common.MkDir : <location>. ;
+make old_crashes : : @mkdir : <location>. ;
 explicit old_crashes ;
 
 local variants = basic_parser parse parser direct_parse ;
@@ -100,7 +101,7 @@ for local variant in basic_parser parse parser direct_parse
     }
     make oldcorpus/$(variant)
         : $(old-corpus-deps)
-        : common.MkDir
+        : @mkdir
         : <location>.
         ;
     explicit oldcorpus/$(variant) ;
@@ -139,6 +140,13 @@ alias run : $(variants)-run ;
 explicit run $(variants)-run ;
 
 
+rule mkdir ( target : source * : props * )
+{
+    local dir = [ path.make [ on $(target) return $(LOCATE) ] ] ;
+    dir = [ path.join $(dir) $(target:G=) ] ;
+    common.MkDir $(dir) ;
+}
+
 rule fuzzer-props ( props * )
 {
     local toolset = [ property.select toolset : $(props) ] ;
@@ -169,21 +177,43 @@ rule run-fuzzer ( target : sources * : props * )
     local flags = [ property.select flags : $(props) ] ;
     FLAGS on $(target) = $(flags:G=) ;
 
+    LOG on $(target) = [ path.native [ path.join $(target) _log ] ] ;
+
     local dir = [ path.make [ on $(target) return $(LOCATE) ] ] ;
     dir = $(dir)/$(target:G=) ;
     common.MkDir $(dir) ;
     DEPENDS $(target) : $(dir) ;
+
+    LOG on $(target) = [ path.native [ path.join $(dir) _log ] ] ;
 }
 
+.SET_STATUS = [ modules.peek testing : .SET_STATUS ] ;
+.STATUS = [ modules.peek testing : .STATUS ] ;
+.RUN_OUTPUT_NL = [ modules.peek testing : .RUN_OUTPUT_NL ] ;
+.STATUS_NOT_0 = [ modules.peek testing : .STATUS_NOT_0 ] ;
+.CATENATE = [ modules.peek testing : .CATENATE ] ;
+.ENDIF = [ modules.peek testing : .ENDIF ] ;
+.NULL_OUT = [ modules.peek common : NULL_OUT ] ;
+.RM = [ common.rm-command ] ;
 actions run-fuzzer
 {
     $(.UBSAN_OPTIONS)
-    $(>[1]) $(<) $(>[2-]) $(FLAGS)
+    $(>[1]) $(<) $(>[2-]) $(FLAGS) > "$(LOG)" 2>&1
+    $(.SET_STATUS)
+    if $(.STATUS_NOT_0)
+        echo ====== BEGIN OUTPUT ======
+        $(.CATENATE) "$(LOG)"
+        echo ====== END OUTPUT ======
+        $(RM) $(LOG) $(.NULL_OUT)
+        exit 1
+    $(.ENDIF)
 }
 
 .TOUCH_FILE = [ common.file-touch-command ] ;
 actions untar-corpus
 {
     tar xf $(>) -C $(<:D)
     $(.TOUCH_FILE) $(<)
+    echo $(<:D)
+    ls $(<:D)
 }