1 files changed, 9 insertions, 2 deletions

diff --git a/ue4/mycpu/test/test.sh b/ue4/mycpu/test/test.sh
index ff1076c..43ddb9a 100755
--- a/ue4/mycpu/test/test.sh
+++ b/ue4/mycpu/test/test.sh
@@ -10,13 +10,20 @@ do
 
   programfile="$input"
   args="-c $programfile"
+  argsfile="${input/_program/_args}"
   memoryfile="${input/_program/_memory}"
   reffile="${input/_program/_output}"
-  if [ -e "$memoryfile" ]
+
+  if [ ! -e "$argsfile" ]
   then
-    args+=" -m $memoryfile"
+    echo "  ERROR: argsfile $argsfile doesn't exist"
+    exit 1
   fi
 
+  args=$(cat "$argsfile")
+  args=${args/\#program\#/$input}
+  args=${args/\#memory\#/$memoryfile}
+
   if [ ! -e "$reffile" ]
   then
     echo "  ERROR: reference file $reffile doesn't exist"