From ed50763135885c339009738ff44a8db434ddc93c Mon Sep 17 00:00:00 2001 From: Lisa Hsu Date: Fri, 1 Dec 2006 13:51:49 -0500 Subject: [PATCH] change this to be a quick one so that it's in the regressions every night - it's only maybe 15 min. long. tests/configs/twosys-tsunami-simple-atomic.py: don't need this import --HG-- rename : tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini => tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini rename : tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out => tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out rename : tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console => tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console rename : tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console => tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console rename : tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt => tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt rename : tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr => tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr rename : tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout => tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout rename : tests/long/80.netperf-stream/test.py => tests/quick/80.netperf-stream/test.py extra : convert_revision : 68497b2ef8b21590cb6c636485703e46dc616513 --- tests/configs/twosys-tsunami-simple-atomic.py | 1 - tests/long/80.netperf-stream/test.py | 2 -- .../twosys-tsunami-simple-atomic/config.ini | 0 .../twosys-tsunami-simple-atomic/config.out | 0 .../console.drivesys.sim_console | 0 .../console.testsys.sim_console | 0 .../twosys-tsunami-simple-atomic/m5stats.txt | 0 .../linux/twosys-tsunami-simple-atomic/stderr | 0 .../linux/twosys-tsunami-simple-atomic/stdout | 0 tests/quick/80.netperf-stream/test.py | 28 +++++++++++++++++++ 10 files changed, 28 insertions(+), 3 deletions(-) delete mode 100644 tests/long/80.netperf-stream/test.py rename tests/{long => quick}/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini (100%) rename tests/{long => quick}/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out (100%) rename tests/{long => quick}/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console (100%) rename tests/{long => quick}/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console (100%) rename tests/{long => quick}/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt (100%) rename tests/{long => quick}/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr (100%) rename tests/{long => quick}/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout (100%) create mode 100644 tests/quick/80.netperf-stream/test.py diff --git a/tests/configs/twosys-tsunami-simple-atomic.py b/tests/configs/twosys-tsunami-simple-atomic.py index 335cea27d..e7214a059 100644 --- a/tests/configs/twosys-tsunami-simple-atomic.py +++ b/tests/configs/twosys-tsunami-simple-atomic.py @@ -29,7 +29,6 @@ import m5 from m5.objects import * m5.AddToPath('../configs/common') -from SysPaths import * from FSConfig import * from Benchmarks import * diff --git a/tests/long/80.netperf-stream/test.py b/tests/long/80.netperf-stream/test.py deleted file mode 100644 index 139597f9c..000000000 --- a/tests/long/80.netperf-stream/test.py +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini similarity index 100% rename from tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini rename to tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini diff --git a/tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out similarity index 100% rename from tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out rename to tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out diff --git a/tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console similarity index 100% rename from tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console rename to tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console diff --git a/tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console similarity index 100% rename from tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console rename to tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console diff --git a/tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt similarity index 100% rename from tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt rename to tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt diff --git a/tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr similarity index 100% rename from tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr rename to tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr diff --git a/tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout similarity index 100% rename from tests/long/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout rename to tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout diff --git a/tests/quick/80.netperf-stream/test.py b/tests/quick/80.netperf-stream/test.py new file mode 100644 index 000000000..1da47fca4 --- /dev/null +++ b/tests/quick/80.netperf-stream/test.py @@ -0,0 +1,28 @@ +# Copyright (c) 2006 The Regents of The University of Michigan +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer; +# redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution; +# neither the name of the copyright holders nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Authors: Lisa Hsu +