equal
deleted
inserted
replaced
675 # testName + " > /dev/null 2>&1") |
675 # testName + " > /dev/null 2>&1") |
676 Params.g_options.cwd_launch = "traces" |
676 Params.g_options.cwd_launch = "traces" |
677 run_program(testName, command_template=get_command_template()) |
677 run_program(testName, command_template=get_command_template()) |
678 |
678 |
679 if verbose: |
679 if verbose: |
680 diffCmd = "diff traces " + refTestDirName + " | head" |
680 #diffCmd = "diff traces " + refTestDirName + " | head" |
|
681 diffCmd = subprocess.Popen(args=["diff", "traces", refTestDirName], stdout=subprocess.PIPE) |
|
682 headCmd = subprocess.Popen(args=["diff", "traces", refTestDirName], stdin=diffCmd.stdout) |
|
683 rc1 = diffCmd.wait() |
|
684 rc2 = headCmd.wait() |
|
685 rc = rc1 or rc2 |
681 else: |
686 else: |
682 diffCmd = "diff traces " + refTestDirName + \ |
687 diffCmd = "diff traces " + refTestDirName + \ |
683 " > /dev/null 2>&1" |
688 " > /dev/null 2>&1" |
684 |
689 rc = os.system(diffCmd) |
685 rc = os.system(diffCmd) |
|
686 if rc: |
690 if rc: |
687 print "----------" |
691 print "----------" |
688 print "Traces differ in test: test-" + testName |
692 print "Traces differ in test: test-" + testName |
689 print "Reference traces in directory: " + refTestDirName |
693 print "Reference traces in directory: " + refTestDirName |
690 print "Traces in directory: traces" |
694 print "Traces in directory: traces" |