From 490ae19d7f9cd49185e6fd70541785ad78a82dc5 Mon Sep 17 00:00:00 2001
From: Kihong Heo <kihong.heo@kaist.ac.kr>
Date: Wed, 19 Aug 2020 22:14:21 +0900
Subject: [PATCH] [Benchmark] fix path

---
 benchmark/bzip2-1.0.5/merged/Makefile | 2 +-
 benchmark/bzip2-1.0.5/merged/test.sh  | 2 +-
 benchmark/chown-8.2/merged/Makefile   | 2 +-
 benchmark/chown-8.2/merged/test.sh    | 2 +-
 benchmark/date-8.21/merged/Makefile   | 2 +-
 benchmark/date-8.21/merged/test.sh    | 2 +-
 benchmark/grep-2.19/merged/Makefile   | 2 +-
 benchmark/grep-2.19/merged/test.sh    | 2 +-
 benchmark/mkdir-5.2.1/merged/Makefile | 2 +-
 benchmark/mkdir-5.2.1/merged/test.sh  | 4 ++--
 benchmark/rm-8.4/merged/Makefile      | 2 +-
 benchmark/rm-8.4/merged/test.sh       | 2 +-
 benchmark/sort-8.16/merged/Makefile   | 2 +-
 benchmark/sort-8.16/merged/test.sh    | 2 +-
 benchmark/tar-1.14/merged/Makefile    | 2 +-
 benchmark/tar-1.14/merged/test.sh     | 2 +-
 benchmark/uniq-8.16/merged/Makefile   | 2 +-
 benchmark/uniq-8.16/merged/test.sh    | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/benchmark/bzip2-1.0.5/merged/Makefile b/benchmark/bzip2-1.0.5/merged/Makefile
index 1d4733d..643a32c 100644
--- a/benchmark/bzip2-1.0.5/merged/Makefile
+++ b/benchmark/bzip2-1.0.5/merged/Makefile
@@ -3,4 +3,4 @@ ORIGIN_BIN=$(NAME).origin
 SRC=$(NAME).c
 ORACLE=test.sh
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/bzip2-1.0.5/merged/test.sh b/benchmark/bzip2-1.0.5/merged/test.sh
index edf5176..c98ea31 100755
--- a/benchmark/bzip2-1.0.5/merged/test.sh
+++ b/benchmark/bzip2-1.0.5/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=bzip2-1.0.5
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced
diff --git a/benchmark/chown-8.2/merged/Makefile b/benchmark/chown-8.2/merged/Makefile
index 424ba92..d66a06d 100644
--- a/benchmark/chown-8.2/merged/Makefile
+++ b/benchmark/chown-8.2/merged/Makefile
@@ -3,4 +3,4 @@ ORIGIN_BIN=$(NAME).origin
 SRC=$(NAME).c
 ORACLE=test.sh
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/chown-8.2/merged/test.sh b/benchmark/chown-8.2/merged/test.sh
index 586a903..ce66723 100755
--- a/benchmark/chown-8.2/merged/test.sh
+++ b/benchmark/chown-8.2/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=chown-8.2
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced
diff --git a/benchmark/date-8.21/merged/Makefile b/benchmark/date-8.21/merged/Makefile
index f79af53..f0ffef3 100644
--- a/benchmark/date-8.21/merged/Makefile
+++ b/benchmark/date-8.21/merged/Makefile
@@ -3,4 +3,4 @@ ORIGIN_BIN=$(NAME).origin
 SRC=$(NAME).c
 ORACLE=test.sh
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/date-8.21/merged/test.sh b/benchmark/date-8.21/merged/test.sh
index 5f1928c..81362ca 100755
--- a/benchmark/date-8.21/merged/test.sh
+++ b/benchmark/date-8.21/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=date-8.21
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced
diff --git a/benchmark/grep-2.19/merged/Makefile b/benchmark/grep-2.19/merged/Makefile
index ace72c4..8b068c3 100644
--- a/benchmark/grep-2.19/merged/Makefile
+++ b/benchmark/grep-2.19/merged/Makefile
@@ -5,4 +5,4 @@ ORACLE=test.sh
 CFLAGS="-D __msan_unpoison(s,z)"
 LFLAGS="-lpcre"
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/grep-2.19/merged/test.sh b/benchmark/grep-2.19/merged/test.sh
index dc35ea2..762bea1 100755
--- a/benchmark/grep-2.19/merged/test.sh
+++ b/benchmark/grep-2.19/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=grep-2.19
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced
diff --git a/benchmark/mkdir-5.2.1/merged/Makefile b/benchmark/mkdir-5.2.1/merged/Makefile
index 2abcff8..518d920 100644
--- a/benchmark/mkdir-5.2.1/merged/Makefile
+++ b/benchmark/mkdir-5.2.1/merged/Makefile
@@ -3,4 +3,4 @@ ORIGIN_BIN=mkdir-5.2.1.origin
 SRC=$(NAME).c
 ORACLE=test.sh
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/mkdir-5.2.1/merged/test.sh b/benchmark/mkdir-5.2.1/merged/test.sh
index d3940b5..459d379 100755
--- a/benchmark/mkdir-5.2.1/merged/test.sh
+++ b/benchmark/mkdir-5.2.1/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=mkdir-5.2.1
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced
@@ -34,7 +34,7 @@ function run_error() {
   rm -rf d1 >&/dev/null
   { timeout $TIMEOUT $REDUCED_BIN $1 $2; } >&temp1 && exit 1
   rm -rf d1 >&/dev/null
-  { $ORIGIN_BIN $1 $2; }>&temp2
+  { $ORIGIN_BIN $1 $2; } >&temp2
   temp1=$(head -n 1 temp1 | cut -d ' ' -f 2,3)
   temp2=$(head -n 1 temp2 | cut -d ' ' -f 2,3)
   if [[ $temp1 == $temp2 ]]; then
diff --git a/benchmark/rm-8.4/merged/Makefile b/benchmark/rm-8.4/merged/Makefile
index ac1d316..35f44c6 100644
--- a/benchmark/rm-8.4/merged/Makefile
+++ b/benchmark/rm-8.4/merged/Makefile
@@ -3,4 +3,4 @@ ORIGIN_BIN=rm-8.4.origin
 SRC=$(NAME).c
 ORACLE=test.sh
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/rm-8.4/merged/test.sh b/benchmark/rm-8.4/merged/test.sh
index 6dca3bf..0b4d9b8 100755
--- a/benchmark/rm-8.4/merged/test.sh
+++ b/benchmark/rm-8.4/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=rm-8.4
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced
diff --git a/benchmark/sort-8.16/merged/Makefile b/benchmark/sort-8.16/merged/Makefile
index 959c08b..fb3efcf 100644
--- a/benchmark/sort-8.16/merged/Makefile
+++ b/benchmark/sort-8.16/merged/Makefile
@@ -4,4 +4,4 @@ SRC=$(NAME).c
 ORACLE=test.sh
 LFLAGS=-lpthread
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/sort-8.16/merged/test.sh b/benchmark/sort-8.16/merged/test.sh
index 3c15040..28e21d0 100755
--- a/benchmark/sort-8.16/merged/test.sh
+++ b/benchmark/sort-8.16/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=sort-8.16
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced
diff --git a/benchmark/tar-1.14/merged/Makefile b/benchmark/tar-1.14/merged/Makefile
index 2e19e11..e4f91b2 100644
--- a/benchmark/tar-1.14/merged/Makefile
+++ b/benchmark/tar-1.14/merged/Makefile
@@ -3,4 +3,4 @@ ORIGIN_BIN=$(NAME).origin
 SRC=$(NAME).c
 ORACLE=test.sh
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/tar-1.14/merged/test.sh b/benchmark/tar-1.14/merged/test.sh
index c611213..6aa12ca 100755
--- a/benchmark/tar-1.14/merged/test.sh
+++ b/benchmark/tar-1.14/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=tar-1.14
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced
diff --git a/benchmark/uniq-8.16/merged/Makefile b/benchmark/uniq-8.16/merged/Makefile
index f472a7e..5d3063e 100644
--- a/benchmark/uniq-8.16/merged/Makefile
+++ b/benchmark/uniq-8.16/merged/Makefile
@@ -3,4 +3,4 @@ ORIGIN_BIN=$(NAME).origin
 SRC=$(NAME).c
 ORACLE=test.sh
 
-include ../target.mk
+include ../../target.mk
diff --git a/benchmark/uniq-8.16/merged/test.sh b/benchmark/uniq-8.16/merged/test.sh
index 4ca4cb6..8fdb85b 100755
--- a/benchmark/uniq-8.16/merged/test.sh
+++ b/benchmark/uniq-8.16/merged/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export BENCHMARK_NAME=uniq-8.16
-export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME
+export BENCHMARK_DIR=$CHISEL_BENCHMARK_HOME/benchmark/$BENCHMARK_NAME/merged
 export SRC=$BENCHMARK_DIR/$BENCHMARK_NAME.c
 export ORIGIN_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.origin
 export REDUCED_BIN=$BENCHMARK_DIR/$BENCHMARK_NAME.reduced