[commit: testsuite] master: Change how the testsuite driver handles copying the test options (2246f3f)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2246f3fd5fda083179c71363cbf01a04491a52fd

>---------------------------------------------------------------

commit 2246f3fd5fda083179c71363cbf01a04491a52fd
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Feb 7 19:00:51 2013 +0000

    Change how the testsuite driver handles copying the test options
    
    We now deepcopy the options for each test, which means that the test
    helpers don't need to worry about sharing.

>---------------------------------------------------------------

 driver/testlib.py |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/driver/testlib.py b/driver/testlib.py
index c262b53..1337392 100644
--- a/driver/testlib.py
+++ b/driver/testlib.py
@@ -264,16 +264,12 @@ def stats_range_field( field, expected, dev ):
     return lambda opts, f=field, x=expected, y=dev: _stats_range_field(opts, f, x, y);
 
 def _stats_range_field( opts, f, x, y ):
-    # copy the dictionary, as the config gets shared between all tests
-    opts.stats_range_fields = opts.stats_range_fields.copy()
     opts.stats_range_fields[f] = (x, y)
 
 def compiler_stats_range_field( field, expected, dev ):
     return lambda opts, f=field, x=expected, y=dev: _compiler_stats_range_field(opts, f, x, y);
 
 def _compiler_stats_range_field( opts, f, x, y ):
-    # copy the dictionary, as the config gets shared between all tests
-    opts.compiler_stats_range_fields = opts.compiler_stats_range_fields.copy()
     opts.compiler_stats_range_fields[f] = (x, y)
 
 # -----
@@ -637,7 +633,9 @@ def test (name, setup, func, args):
         framework_fail(name, 'duplicate', 'There are multiple tests with this name')
     if not re.match('^[0-9]*[a-zA-Z][a-zA-Z0-9._-]*$', name):
         framework_fail(name, 'bad_name', 'This test has an invalid name')
-    myTestOpts = copy.copy(thisdir_testopts)
+    # We need a deepcopy so that dictionarys, such as the stats_range_fields
+    # dictionary, get copied too.
+    myTestOpts = copy.deepcopy(thisdir_testopts)
 
     if type(setup) is types.ListType:
        setup = composes(setup)