Merge pull request #22 from nikomatsakis/patches

extend process.sh to support patch stages

Author: nrc

futures-rs-test-all/makefile

@@ -6,3 +6,5 @@ touch:
 	rm -f target/debug/all-*
 clean:
 	cargo clean
+patches:
+	@echo ''

helloworld/makefile

@@ -6,3 +6,5 @@ touch:
 	find . -name '*.rs' | xargs touch
 clean:
 	cargo clean
+patches:
+	@echo ''

html5ever-2016-08-25/makefile

@@ -6,3 +6,5 @@ touch:
 	find . -name '*.rs' | xargs touch
 clean:
 	cargo clean
+patches:
+	@echo ''

hyper.0.5.0/makefile

@@ -6,3 +6,5 @@ touch:
 	find . -name '*.rs' | xargs touch
 clean:
 	cargo clean
+patches:
+	@echo ''

inflate-0.1.0/makefile

@@ -6,3 +6,5 @@ touch:
 	find . -name '*.rs' | xargs touch
 clean:
 	cargo clean
+patches:
+	@echo ''

issue-32062-equality-relations-complexity/makefile

@@ -6,3 +6,5 @@ touch:
 	find . -name '*.rs' | xargs touch
 clean:
 	cargo clean
+patches:
+	@echo ''

issue-32278-big-array-of-strings/makefile

@@ -6,3 +6,5 @@ touch:
 	find . -name '*.rs' | xargs touch
 clean:
 	cargo clean
+patches:
+	@echo ''

jld-day15-parser/makefile

@@ -6,3 +6,5 @@ touch:
 	find . -name '*.rs' | xargs touch
 clean:
 	cargo clean
+patches:
+	@echo ''

piston-image-0.10.3/makefile

@@ -6,3 +6,5 @@ touch:
 	find . -name '*.rs' | xargs touch
 clean:
 	cargo clean
+patches:
+	@echo ''

process.sh

@@ -1,37 +1,66 @@
 #!/bin/bash
 
-TIMES_DIR=/home/ncameron/times
-SCRIPTS_DIR=/home/ncameron/times-scripts
+if [ -z "$TIMES_DIR" ]; then
+    TIMES_DIR=/home/ncameron/times
+fi
+if [ -z "$SCRIPTS_DIR" ]; then
+    SCRIPTS_DIR=/home/ncameron/times-scripts
+fi
+
+echo TIMES_DIR=$TIMES_DIR
+echo SCRIPTS_DIR=$SCRIPTS_DIR
 
 START=$(pwd)
 export CARGO_RUSTC_OPTS="-Ztime-passes -Zinput-stats"
 export PATH=$RUSTC_DIR/bin:$PATH
 
-for dir in *; do
+# Check if user provided list of directories;
+# else process them all.
+if [ "$1" != "" ]; then
+    DIRS="$@"
+else
+    DIRS="*"
+fi    
+
+for dir in $DIRS; do
     if [[ -d $dir ]]; then
         echo "Processing $dir"
 
+        cd $START/$dir
+        PATCHES=($(make patches))
+        if [ ! "${PATCHES[*]}" ]; then
+            PATCHES=('')
+        fi
+
+        echo Patches: ${PATCHES[*]}
+
         for i in 0 1 2 3 4 5
         do
-            cd $RUST_DIR
-            git show HEAD -s >$TIMES_DIR/raw/$dir--$DATE--$i.log
-            cd $START/$dir
-            echo "rustc: ./$dir" >>$TIMES_DIR/raw/$dir--$DATE--$i.log
-            make >>$TIMES_DIR/raw/$dir--$DATE--$i.log
-            echo "done" >>$TIMES_DIR/raw/$dir--$DATE--$i.log
-
+            for PATCH in "${PATCHES[@]}"; do
+                cd $RUST_DIR
+                git show HEAD -s >$TIMES_DIR/raw/$dir$PATCH--$DATE--$i.log
+                cd $START/$dir
+                echo "rustc: ./$dir" >>$TIMES_DIR/raw/$dir$PATCH--$DATE--$i.log
+                make all$PATCH >>$TIMES_DIR/raw/$dir$PATCH--$DATE--$i.log
+                echo "done" >>$TIMES_DIR/raw/$dir$PATCH--$DATE--$i.log
+            done
             make touch >/dev/null
         done
 
         make clean >/dev/null
 
         cd $TIMES_DIR
-        python $SCRIPTS_DIR/process.py $dir $DATE 6
+        for PATCH in "${PATCHES[@]}"; do
+            python $SCRIPTS_DIR/process.py "$dir$PATCH" "$DATE" 6
+        done
+
         for i in 0 1 2 3 4 5
         do
-            git add raw/$dir--$DATE--$i.log
-            git add raw/orbit-$dir--$DATE--$i.log
-            git add processed/$dir--$DATE--$i.json
+            for PATCH in "${PATCHES[@]}"; do
+                git add "raw/$dir$PATCH--$DATE--$i.log"
+                git add "raw/orbit-$dir$PATCH--$DATE--$i.log"
+                git add "processed/$dir$PATCH--$DATE--$i.json"
+            done
         done
 
         cd $START