From d45e364c694b26d45eff968d44062cdcc864914b Mon Sep 17 00:00:00 2001
From: Sandino Araico Sanchez <sandino@sandino.net>
Date: Thu, 19 Jan 2017 18:46:27 -0600
Subject: [PATCH] re-run memory and fio tests

---
 scripts/test-all  |  7 ++++---
 scripts/test-fio  | 27 ++++++++++++++-------------
 scripts/test-pmbw |  6 ++++--
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/scripts/test-all b/scripts/test-all
index 06a4181..aa7e8de 100755
--- a/scripts/test-all
+++ b/scripts/test-all
@@ -34,16 +34,17 @@ scan-netdev
 #test-memtester summary
 #test-badblocks summary
 
+test-fio
 test-pmbw
 test-linpack
-test-fio
 
 # Take snapshot
 mkdir -p $SNAPSHOT_D
 cp -af $OUTPUT_DIR/* $SNAPSHOT_D/
 
 rm -f /run/test.pid 
-while [[ 1 ]] ; do
+#while [[ 1 ]] ; do
 	sleep 3600
-done
+#done
+halt
 
diff --git a/scripts/test-fio b/scripts/test-fio
index f896793..d74aac8 100755
--- a/scripts/test-fio
+++ b/scripts/test-fio
@@ -5,20 +5,21 @@ if [[ -z $OUTPUT_DIR ]] ; then
 fi
 
 source test-variables
-SUMMARY=0
-if [[ "$1" == "summary" ]] ; then
-	SUMMARY=plain
-elif [[ "$1" == "csv" ]] ; then
-	SUMMARY=csv
-else
-	if [[ -f $OUTPUT_DIR/disk.lst ]] ; then
-		mv -vf $OUTPUT_DIR/disk.lst $OUTPUT_DIR/disk.$MY_DATETIME
-	fi
-	scan-hdd # Always rescan
-fi
-if [[ "$1" == "force" ]] ; then
+
+#SUMMARY=0
+#if [[ "$1" == "summary" ]] ; then
+#	SUMMARY=plain
+#elif [[ "$1" == "csv" ]] ; then
+#	SUMMARY=csv
+#else
+#	if [[ -f $OUTPUT_DIR/disk.lst ]] ; then
+#		mv -vf $OUTPUT_DIR/disk.lst $OUTPUT_DIR/disk.$MY_DATETIME
+#	fi
+#fi
+scan-hdd # Always rescan
+#if [[ "$1" == "force" ]] ; then
 	rm -f $OUTPUT_DIR/disk/*.fio.result
-fi
+#fi
 
 MAXWAIT=9
 JOBS=0
diff --git a/scripts/test-pmbw b/scripts/test-pmbw
index 32875fb..3f6d25a 100755
--- a/scripts/test-pmbw
+++ b/scripts/test-pmbw
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-source scan-dmidecode
+if [[ -z $OUTPUT_DIR ]] ; then
+	source scan-dmidecode
+fi
 source test-variables
 
 mkdir -pv $OUTPUT_DIR/pmbw
@@ -14,7 +16,7 @@ fi
 # pmbw ‐f ScanWrite64PtrSimpleLoop -Q -s 4096 -S 8192 -p6 -P7
 #(2017-01-13 05:50:00) Rolando Cedillo Caballero: Digamos probar desde 2^11 a 2^25 y con eso bastaría. 
 #(2017-01-13 05:51:19) Rolando Cedillo Caballero: 2^11 a 2^26 debería bastar si no tarda más de un par de horas.
-pmbw ‐f ScanWrite64PtrSimpleLoop -Q -s 2048 -S $((64*1024*1024))
+pmbw ‐f ScanWrite64PtrSimpleLoop -Q -s 2048 -S $((1024*1024*1024))
 
 RES=$?
 ERRNO=$!