From 655ef76a6cb3e7827b9830fc4e81320ee0b0e040 Mon Sep 17 00:00:00 2001
From: sprado <sprado@dram.eit.uni-kl.de>
Date: Wed, 1 Jun 2016 13:04:58 +0200
Subject: [PATCH] Tests update

---
 DRAMSys/tests/error/sim-batch.xml  | 20 ++++++++++----------
 DRAMSys/tests/simple/sim-batch.xml | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/DRAMSys/tests/error/sim-batch.xml b/DRAMSys/tests/error/sim-batch.xml
index b11cc7e9..3ea21963 100644
--- a/DRAMSys/tests/error/sim-batch.xml
+++ b/DRAMSys/tests/error/sim-batch.xml
@@ -2,22 +2,22 @@
     <!-- General Simulator Configuration (used for all simulation setups) -->
     <simconfig>
         <Debug value="0" />
-        <DatabaseRecording value="0" />
+        <DatabaseRecording value="1" />
         <PowerAnalysis value="1" />
-        <PowerWindowSize value="10" />
-        <PowerWindowUnit value="us" />
+        <NumberOfTimeWindows value="1000" />
         <NumberOfTracePlayers value="1"/>
         <NumberOfMemChannels value="4"/>
         <ControllerCoreDisableRefresh value="0"/>
         <ThermalSimulation value="0"/>
+        <SimulationProgressBar value="1"/>
     </simconfig>
 
     <!-- Temperature Simulator Configuration (used for all simulation setups) -->
     <thermalsimconfig>
         <TemperatureScale value="Celsius" />
         <StaticTemperatureDefaultValue value="89" />
-        <ThermalSimPeriod value="10" />
-        <ThermalSimUnit value="ms" />
+        <ThermalSimPeriod value="100" />
+        <ThermalSimUnit value="us" />
         <PowerInfoFile value="../../DRAMSys/simulator/resources/configs/thermalsim/powerInfo.xml"/>
         <IceServerIp value="127.0.0.1" />
         <IceServerPort value="11880" />
@@ -28,20 +28,20 @@
     </thermalsimconfig>
 
     <memspecs>
-        <memspec src="../../DRAMSys/tests/error/WideIO.xml"></memspec>
+        <memspec src="../../DRAMSys/simulator/resources/configs/memspecs/WideIO.xml"></memspec>
     </memspecs>
 
     <addressmappings>
-        <addressmapping src="../../DRAMSys/tests/error/am_wideio.xml"></addressmapping>
+        <addressmapping src="../../DRAMSys/simulator/resources/configs/amconfigs/am_wideio.xml"></addressmapping>
     </addressmappings>
 
     <memconfigs>
-        <memconfig src="../../DRAMSys/tests/error/fr_fcfs.xml"/>
+        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml"/>
     </memconfigs>
 
     <tracesetups>
-        <tracesetup id="errorTest_fr_fcfs_test_error.stl">
-            <device clkMhz="1000">../../../tests/error/test_error.stl</device>
+        <tracesetup id="fifo">
+            <device clkMhz="200">chstone-adpcm_32.stl</device>
         </tracesetup>
     </tracesetups>
 
diff --git a/DRAMSys/tests/simple/sim-batch.xml b/DRAMSys/tests/simple/sim-batch.xml
index 2b4cd2df..3ea21963 100644
--- a/DRAMSys/tests/simple/sim-batch.xml
+++ b/DRAMSys/tests/simple/sim-batch.xml
@@ -4,20 +4,20 @@
         <Debug value="0" />
         <DatabaseRecording value="1" />
         <PowerAnalysis value="1" />
-        <PowerWindowSize value="10" />
-        <PowerWindowUnit value="us" />
+        <NumberOfTimeWindows value="1000" />
         <NumberOfTracePlayers value="1"/>
         <NumberOfMemChannels value="4"/>
         <ControllerCoreDisableRefresh value="0"/>
         <ThermalSimulation value="0"/>
+        <SimulationProgressBar value="1"/>
     </simconfig>
 
     <!-- Temperature Simulator Configuration (used for all simulation setups) -->
     <thermalsimconfig>
         <TemperatureScale value="Celsius" />
         <StaticTemperatureDefaultValue value="89" />
-        <ThermalSimPeriod value="10" />
-        <ThermalSimUnit value="ms" />
+        <ThermalSimPeriod value="100" />
+        <ThermalSimUnit value="us" />
         <PowerInfoFile value="../../DRAMSys/simulator/resources/configs/thermalsim/powerInfo.xml"/>
         <IceServerIp value="127.0.0.1" />
         <IceServerPort value="11880" />
@@ -36,11 +36,11 @@
     </addressmappings>
 
     <memconfigs>
-        <memconfig src="../../DRAMSys/tests/simple/fifoStrict.xml"/>
+        <memconfig src="../../DRAMSys/simulator/resources/configs/memconfigs/fifoStrict.xml"/>
     </memconfigs>
 
     <tracesetups>
-        <tracesetup id="simple_test_fifoStrict_chstone-adpcm_32">
+        <tracesetup id="fifo">
             <device clkMhz="200">chstone-adpcm_32.stl</device>
         </tracesetup>
     </tracesetups>