View | Details | Raw Unified | Return to bug 532
Collapse All | Expand All

(-)a/regression.py (-5 / +6 lines)
 Lines 147-165    Link Here 
147
            script = os.path.abspath(os.path.join('..', *os.path.split(program)))
147
            script = os.path.abspath(os.path.join('..', *os.path.split(program)))
148
            argv = [self.env['PYTHON'], script] + arguments
148
            argv = [self.env['PYTHON'], script] + arguments
149
            try:
149
            try:
150
                wutils.run_argv(argv, cwd=trace_output_path)
150
                rc = wutils.run_argv(argv, cwd=trace_output_path)
151
            except Utils.WafError, ex:
151
            except Utils.WafError, ex:
152
                print >> sys.stderr, ex
152
                print >> sys.stderr, ex
153
                return 1
153
                return 1
154
        else:
154
        else:
155
            try:
155
            try:
156
                wutils.run_program(program,
156
                rc = wutils.run_program(program,
157
                                   command_template=wutils.get_command_template(self.env, arguments),
157
                                        command_template=wutils.get_command_template(self.env, arguments),
158
                                   cwd=trace_output_path)
158
                                        cwd=trace_output_path)
159
            except Utils.WafError, ex:
159
            except Utils.WafError, ex:
160
                print >> sys.stderr, ex
160
                print >> sys.stderr, ex
161
                return 1
161
                return 1
162
162
        if rc:
163
            return rc
163
        rc = diff(trace_output_path, reference_traces_path, Options.options.verbose)
164
        rc = diff(trace_output_path, reference_traces_path, Options.options.verbose)
164
        if rc:
165
        if rc:
165
            print "----------"
166
            print "----------"

Return to bug 532