From 6b80e6fe73286ee30dcdf76aef1be86372e1458e Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Tue, 7 Jan 2014 16:47:56 +0000
Subject: [PATCH] Task #5291: disable performance checks on tCorrelate_ log
files: it doesn't work properly for a few reasons and the shell prints an
error. Also remove a bit of disabled code.
---
RTCP/Cobalt/GPUProc/src/rtcp.cc | 5 -----
RTCP/Cobalt/GPUProc/test/testParset.sh | 5 ++---
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/RTCP/Cobalt/GPUProc/src/rtcp.cc b/RTCP/Cobalt/GPUProc/src/rtcp.cc
index 1ff48c06c69..51a3c6bf11f 100644
--- a/RTCP/Cobalt/GPUProc/src/rtcp.cc
+++ b/RTCP/Cobalt/GPUProc/src/rtcp.cc
@@ -187,11 +187,6 @@ int main(int argc, char **argv)
if (setenv("TZ", "UTC", 1) < 0)
THROW_SYSCALL("setenv(TZ)");
- // Restrict access to (tmp build) files we create to owner
- // JD: Don't do that! We want to be able to clean up each other's
- // mess.
- // umask(S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH);
-
// Create a parameters set object based on the inputs
LOG_INFO("----- Reading Parset");
Parset ps(argv[optind]);
diff --git a/RTCP/Cobalt/GPUProc/test/testParset.sh b/RTCP/Cobalt/GPUProc/test/testParset.sh
index 0992861cd8b..62f40049ba6 100755
--- a/RTCP/Cobalt/GPUProc/test/testParset.sh
+++ b/RTCP/Cobalt/GPUProc/test/testParset.sh
@@ -125,11 +125,10 @@ function parse_logs
#disabled, as we do not use it atm and the ops nrs are out-of-date, but it is time-consuming)
# runObservation.sh -F -l 4 -p $PARSET > performance_profiled.txt 2>&1 || error "Profiling observation failed"
- # check logs
+ # check logs for performance degradation (disabled, checks not good enough and operation counts out-of-date)
# parse_logs performance_normal.txt performance_profiled.txt || error "Could not parse log files"
- parse_logs performance_normal.txt || error "Could not parse log files"
# toss output if everything is ok, but do not fail test if removal fails
- rm -rf $testdir/$OUTDIR || true # Comment this line for output
+# rm -rf $testdir/$OUTDIR || true # Comment this line for output
) || exit 1
--
GitLab