| SConscript (6928:5bd33f7c26ea) | SConscript (7685:9782e93eeb63) |
|---|---|
| 1# -*- mode:python -*- 2 3# Copyright (c) 2004-2006 The Regents of The University of Michigan 4# All rights reserved. 5# 6# Redistribution and use in source and binary forms, with or without 7# modification, are permitted provided that the following conditions are 8# met: redistributions of source code must retain the above copyright --- 94 unchanged lines hidden (view full) --- 103 cmd = '%s -t %d %s' % (env['BATCH_CMD'], timeout, cmd) 104 105 status = env.Execute(env.subst(cmd, target=target, source=source)) 106 if status == 0: 107 # M5 terminated normally. 108 # Run diff on output & ref directories to find differences. 109 # Exclude the stats file since we will use diff-out on that. 110 outdiff = os.path.join(tgt_dir, 'outdiff') | 1# -*- mode:python -*- 2 3# Copyright (c) 2004-2006 The Regents of The University of Michigan 4# All rights reserved. 5# 6# Redistribution and use in source and binary forms, with or without 7# modification, are permitted provided that the following conditions are 8# met: redistributions of source code must retain the above copyright --- 94 unchanged lines hidden (view full) --- 103 cmd = '%s -t %d %s' % (env['BATCH_CMD'], timeout, cmd) 104 105 status = env.Execute(env.subst(cmd, target=target, source=source)) 106 if status == 0: 107 # M5 terminated normally. 108 # Run diff on output & ref directories to find differences. 109 # Exclude the stats file since we will use diff-out on that. 110 outdiff = os.path.join(tgt_dir, 'outdiff') |
| 111 diffcmd = 'diff -ubr %s ${SOURCES[2].dir} %s > %s' \ | 111 diffcmd = 'diff -ubrs %s ${SOURCES[2].dir} %s > %s' \ |
| 112 % (output_ignore_args, tgt_dir, outdiff) 113 env.Execute(env.subst(diffcmd, target=target, source=source)) 114 print "===== Output differences =====" 115 print contents(outdiff) 116 # Run diff-out on stats.txt file 117 statsdiff = os.path.join(tgt_dir, 'statsdiff') 118 diffcmd = '$DIFFOUT ${SOURCES[2]} %s > %s' \ 119 % (os.path.join(tgt_dir, 'stats.txt'), statsdiff) --- 173 unchanged lines hidden --- | 112 % (output_ignore_args, tgt_dir, outdiff) 113 env.Execute(env.subst(diffcmd, target=target, source=source)) 114 print "===== Output differences =====" 115 print contents(outdiff) 116 # Run diff-out on stats.txt file 117 statsdiff = os.path.join(tgt_dir, 'statsdiff') 118 diffcmd = '$DIFFOUT ${SOURCES[2]} %s > %s' \ 119 % (os.path.join(tgt_dir, 'stats.txt'), statsdiff) --- 173 unchanged lines hidden --- |