bug fixes to new build system.

Former-commit-id: 8fb87d43a2c339de45688553804e9bb25cce6e21

SConscript

@@ -72,10 +72,10 @@ if int(argenv['build_ida']) == 1:
 	print "Build IDA Plugin"
 	lib=SConscript('SConscript.ida', variant_dir='build_ida')
 	print "Done build IDA Plugin"
-	test=argenv.Command(target="./test.log", source=lib, action="SMPSA_HOME=$SMPSA_HOME $SMPSA_HOME/tests/scripts/make_baseline.sh 2>&1 |tee ./test.log")
-	Depends(test,lib)
-	ab=AlwaysBuild(test)
-	Default(ab)
+	test=argenv.Command(target="./test.log", source=lib, action="IDAROOT=$IDAROOT SMPSA_HOME=$SMPSA_HOME $SMPSA_HOME/tests/scripts/make_baseline.sh 2>&1 |tee ./test.log")
+	argenv.Depends(test,lib)
+	ab=argenv.AlwaysBuild(test)
+	argenv.Default(ab)
 	
 
 if int(argenv['build_irdb']) == 1 or int(argenv['build_irdb_driver']) == 1:

tests/scripts/make_baseline.sh

@@ -32,7 +32,8 @@ doit()
 			fi
 			cp $basic_filename $save_filename
 			cp $trim_filename $trim_save_filename
-			echo " already exists, reusing ..."
+		else
+			echo -n " already exists, reusing ..."
 		fi
 		echo "Done."
 	done