--- a/wscript	Fri Oct 15 12:53:05 2010 -0700
+++ b/wscript	Fri Oct 15 16:31:32 2010 -0700
@@ -43,7 +43,6 @@
 
 # local modules
 import wutils
-import regression
 
 Configure.autoconfig = 1
 
@@ -54,14 +53,6 @@
 wutils.VERSION = VERSION
 wutils.APPNAME = APPNAME
 
-#
-# The last part of the path name to use to find the regression traces.  The
-# path will be APPNAME + '-' + VERSION + REGRESSION_SUFFIX, e.g.,
-# ns-3-dev-ref-traces
-#
-REGRESSION_SUFFIX = "-ref-traces"
-
-
 # these variables are mandatory ('/' are converted automatically)
 srcdir = '.'
 blddir = 'build'
@@ -97,22 +88,6 @@
     shutil.rmtree("doc/latex", True)
     shutil.rmtree("nsc", True)
 
-    ## build the name of the traces subdirectory.  Will be something like
-    ## ns-3-dev-ref-traces
-    traces_name = APPNAME + '-' + VERSION + REGRESSION_SUFFIX
-    ## Create a tar.bz2 file with the traces
-    env = load_env()
-    regression_dir = env['REGRESSION_TRACES']
-    if not os.path.isdir(regression_dir):
-        Logs.warn("Not creating traces archive: the %s directory does not exist" % regression_dir)
-    else:
-        traceball = traces_name + wutils.TRACEBALL_SUFFIX
-        tar = tarfile.open(os.path.join("..", traceball), 'w:bz2')
-        files = get_files(regression_dir)
-        for fullfilename,relfilename in files:
-            tar.add(fullfilename,arcname=relfilename)
-        tar.close()
-
 def set_options(opt):
     # options provided by the modules
     opt.tool_options('compiler_cc')
@@ -177,23 +152,9 @@
     opt.add_option('--disable-examples',
                    help=('Do not build the ns-3 examples and samples.'),
                    dest='enable_examples', action='store_false')
-    opt.add_option('--regression',
-                   help=("Enable regression testing; only used for the 'check' target"),
-                   default=False, dest='regression', action="store_true")
     opt.add_option('--check',
                    help=('DEPRECATED (run ./test.py)'),
                    default=False, dest='check', action="store_true")
-    opt.add_option('--regression-generate',
-                   help=("Generate new regression test traces."),
-                   default=False, dest='regression_generate', action="store_true")
-    opt.add_option('--regression-tests',
-                   help=('For regression testing, only run/generate the indicated regression tests, '
-                         'specified as a comma separated list of test names'),
-                   dest='regression_tests', type="string")
-    opt.add_option('--with-regression-traces',
-                   help=('Path to the regression reference traces directory'),
-                   default=None,
-                   dest='regression_traces', type="string")
     opt.add_option('--enable-static',
                    help=('Compile NS-3 statically: works only on linux, without python'),
                    dest='enable_static', action='store_true',
@@ -258,20 +219,6 @@
         pass
     conf.check_tool('command', ['waf-tools'])
 
-    # Check for the location of regression reference traces
-    if Options.options.regression_traces is not None:
-        if os.path.isdir(Options.options.regression_traces):
-            conf.check_message("regression traces location", '', True, ("%s (given)" % Options.options.regression_traces))
-            conf.env['REGRESSION_TRACES'] = os.path.abspath(Options.options.regression_traces)
-    else:
-        traces = os.path.join('..', "%s-%s%s" % (APPNAME, VERSION, REGRESSION_SUFFIX))
-        if os.path.isdir(traces):
-            conf.check_message("regression reference traces", '', True, ("%s (guessed)" % traces))
-            conf.env['REGRESSION_TRACES'] = os.path.abspath(traces)
-        del traces
-    if not conf.env['REGRESSION_TRACES']:
-        conf.check_message("regression reference traces", '', False)
-
     # create the second environment, set the variant and set its name
     variant_env = conf.env.copy()
     variant_name = Options.options.build_profile
@@ -373,9 +320,6 @@
     conf.report_optional_feature("ENABLE_EXAMPLES", "Build examples and samples", env['ENABLE_EXAMPLES'], 
                                  why_not_examples)
 
-    # we cannot pull regression traces without mercurial
-    conf.find_program('hg', var='MERCURIAL')
-
     conf.find_program('valgrind', var='VALGRIND')
 
     env['ENABLE_STATIC_NS3'] = False
@@ -645,19 +589,6 @@
             if type(gen).__name__ in ['ns3header_taskgen', 'ns3moduleheader_taskgen']:
                 gen.post()
 
-    if Options.options.regression or Options.options.regression_generate:
-        regression_traces = env['REGRESSION_TRACES']
-        if not regression_traces:
-            raise Utils.WafError("Cannot run regression tests: reference traces directory not given"
-                                 " (--with-regression-traces configure option)")
-
-        if env['ENABLE_EXAMPLES'] == True:
-            regression.run_regression(bld, regression_traces)
-        else:
-            raise Utils.WafError("Cannot run regression tests: building the ns-3 examples is not enabled"
-                                 " (regression tests are based on examples)")
-
-
     if Options.options.doxygen_no_build:
         _doxygen(bld)
         raise SystemExit(0)