From c8c87655382b4f07de80c67b05a7020adbc4ec4b Mon Sep 17 00:00:00 2001 From: Ger van Diepen <diepen@astron.nl> Date: Thu, 5 Jan 2012 11:06:03 +0000 Subject: [PATCH] Task #2699 Fixed test failure --- CEP/MS/test/tmakems.run | 8 +++++--- CEP/MS/test/tmakems.stdout | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CEP/MS/test/tmakems.run b/CEP/MS/test/tmakems.run index cf3fe63a116..4e73f04aec0 100755 --- a/CEP/MS/test/tmakems.run +++ b/CEP/MS/test/tmakems.run @@ -24,7 +24,7 @@ # Set srcdir if not defined (in case run by hand). if test "$srcdir" = ""; then - srcdir="../../../test" + srcdir="../../../../../LOFAR/CEP/MS/test" fi # Symlink to scripts/programs, so they can be started from test directory. @@ -56,14 +56,16 @@ echo "AntennaTableName=$wd/tmakems_tmp/WSRT_ANTENNA" >> tmakems.parset # Create MS parts in a distributed way. -./makemsdistr -hfn $wd/tmakems_tmp/hfn tmakems.parset $wd/tmakems_tmp.cd $wd +makemsdistr -hfn $wd/tmakems_tmp/hfn tmakems.parset $wd/tmakems_tmp.cd $wd echo "<<<" # Print global VDS file without system-dependent names. grep -v 'Name *=' tmakems_tmp/vds/tmakems_tmp.ms.gds | grep -v "ClusterDesc *=" echo -./makems tmakems.parset +echo ">>>" +makems tmakems.parset +echo "<<<" grep -v 'Name *=' tmakems_tmp.ms.gds | grep -v "ClusterDesc *=" # Clean up. diff --git a/CEP/MS/test/tmakems.stdout b/CEP/MS/test/tmakems.stdout index 853a5981a20..e22c0d7d1ab 100644 --- a/CEP/MS/test/tmakems.stdout +++ b/CEP/MS/test/tmakems.stdout @@ -36,8 +36,10 @@ Part1.NChan = [16,16] Part1.StartFreqs = [1173200000,1173300000,1173400000,1173500000,1173600000,1173700000,1173800000,1173900000,1174000000,1174100000,1174200000,1174300000,1174400000,1174500000,1174600000,1174700000,1174800000,1174900000,1175000000,1175100000,1175200000,1175300000,1175400000,1175500000,1175600000,1175700000,1175800000,1175900000,1176000000,1176100000,1176200000,1176300000] Part1.EndFreqs = [1173300000,1173400000,1173500000,1173600000,1173700000,1173800000,1173900000,1174000000,1174100000,1174200000,1174300000,1174400000,1174500000,1174600000,1174700000,1174800000,1174900000,1175000000,1175100000,1175200000,1175300000,1175400000,1175500000,1175600000,1175700000,1175800000,1175900000,1176000000,1176100000,1176200000,1176300000,1176400000] +>>> Created 2 MS parts and their VDS files Created global VDS file tmakems_tmp.ms.gds +<<< StartTime = 2000/08/03/13:22:30.000 EndTime = 2000/08/03/13:24:50.000 StepTime = 10 -- GitLab