Task #8256; Fixed most tests

.gitattributes

@@ -4383,6 +4383,7 @@ RTCP/Cobalt/CoInterface/test/tParset.sh eol=lf
 RTCP/Cobalt/CoInterface/test/tRingCoordinates.py eol=lf
 RTCP/Cobalt/CoInterface/test/tRingCoordinates.sh eol=lf
 RTCP/Cobalt/CoInterface/test/tSelfDestructTimer.cc -text
+RTCP/Cobalt/CoInterface/test/tcmpfloat.run eol=lf
 RTCP/Cobalt/CoInterface/test/tcmpfloat.sh eol=lf
 RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP0-1sb-P001.raw.gz -text svneol=unset#application/x-gzip
 RTCP/Cobalt/CobaltTest/test/tManyPartTABOutput.in_SAP0-4sb-P000.raw.gz -text svneol=unset#application/x-gzip

CEP/DP3/DPPP/test/tApplyBeam.run

@@ -24,37 +24,37 @@ tar zxf ${srcdir}/tApplyBeam.tab.tgz
 echo "    select result of 0 rows" > taql.ref
 
 echo; echo "Test with invert=true and usechannelfreq=false"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=outinv.ms steps=[applybeam] applybeam.usechannelfreq=false applybeam.invert=true
+NDPPP msin=tNDPPP-generic.MS msout=outinv.ms steps=[applybeam] applybeam.usechannelfreq=false applybeam.invert=true
 # Compare the DATA column of the output MS with the BBS reference output.
 $taqlexe 'select from outinv.ms t1, tApplyBeam.tab t2 where not all(near(t1.DATA,t2.DATA_noucf,1e-5) || (isnan(t1.DATA) && isnan(t2.DATA_noucf)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "### Test with invert=false on the output of the previous step"; echo
-../../src/NDPPP msin=outinv.ms msout=out.ms steps=[applybeam] applybeam.usechannelfreq=false applybeam.invert=false
+NDPPP msin=outinv.ms msout=out.ms steps=[applybeam] applybeam.usechannelfreq=false applybeam.invert=false
 # Compare the DATA column of the output MS with the original MS.
 $taqlexe 'select from out.ms t1, tNDPPP-generic.MS t2 where not all(near(t1.DATA,t2.DATA,1e-5) || (isnan(t1.DATA) && isnan(t2.DATA)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test with invert=true and usechannelfreq=true"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=outinv.ms msout.overwrite=true steps=[applybeam] applybeam.usechannelfreq=true applybeam.invert=true
+NDPPP msin=tNDPPP-generic.MS msout=outinv.ms msout.overwrite=true steps=[applybeam] applybeam.usechannelfreq=true applybeam.invert=true
 # Compare the DATA column of the output MS with the BBS reference output.
 $taqlexe 'select from outinv.ms t1, tApplyBeam.tab t2 where not all(near(t1.DATA,t2.DATA_ucf,1e-5) || (isnan(t1.DATA) && isnan(t2.DATA_ucf)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test with invert=false on the output of the previous step"; echo
-../../src/NDPPP msin=outinv.ms msout=out.ms msout.overwrite=true steps=[applybeam] applybeam.usechannelfreq=true applybeam.invert=false
+NDPPP msin=outinv.ms msout=out.ms msout.overwrite=true steps=[applybeam] applybeam.usechannelfreq=true applybeam.invert=false
 # Compare the DATA column of the output MS with the original MS.
 $taqlexe 'select from out.ms t1, tNDPPP-generic.MS t2 where not all(near(t1.DATA,t2.DATA,1e-5) || (isnan(t1.DATA) && isnan(t2.DATA)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test with beammode=ARRAY_FACTOR"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=outinv.ms msout.overwrite=true steps=[applybeam] applybeam.usechannelfreq=true applybeam.invert=true applybeam.beammode=ARRAY_FACTOR
+NDPPP msin=tNDPPP-generic.MS msout=outinv.ms msout.overwrite=true steps=[applybeam] applybeam.usechannelfreq=true applybeam.invert=true applybeam.beammode=ARRAY_FACTOR
 # Compare the DATA column of the output MS with the BBS reference output.
 $taqlexe 'select from outinv.ms t1, tApplyBeam.tab t2 where not all(near(t1.DATA,t2.DATA_ARRAY_FACTOR,1e-5) || (isnan(t1.DATA) && isnan(t2.DATA_ARRAY_FACTOR)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test with beammode=ELEMENT"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=outinv.ms msout.overwrite=true steps=[applybeam] applybeam.usechannelfreq=true applybeam.invert=true applybeam.beammode=ELEMENT
+NDPPP msin=tNDPPP-generic.MS msout=outinv.ms msout.overwrite=true steps=[applybeam] applybeam.usechannelfreq=true applybeam.invert=true applybeam.beammode=ELEMENT
 # Compare the DATA column of the output MS with the BBS reference output.
 $taqlexe 'select from outinv.ms t1, tApplyBeam.tab t2 where not all(near(t1.DATA,t2.DATA_ELEMENT,1e-5) || (isnan(t1.DATA) && isnan(t2.DATA_ELEMENT)))' > taql.out
 diff taql.out taql.ref  ||  exit 1

CEP/DP3/DPPP/test/tDemix.run_tmpl

@@ -7,7 +7,7 @@ taqlexe=@TAQL_EXECUTABLE@
 
 echo; echo "### Test without target."; echo
 rm -rf instrument
-../../src/NDPPP tDemix.parset demix.ignoretarget=true
+NDPPP tDemix.parset demix.ignoretarget=true
 # Compare some columns of the output MS with the reference output.
 $taqlexe 'select from tDemix_out.MS t1, tDemix_ref1.MS t2 where not all(near(t1.DATA,t2.DATA,1e-3) || (isnan(t1.DATA) && isnan(t2.DATA)))  ||  not all(t1.FLAG = t2.FLAG)  ||  not all(near(t1.WEIGHT_SPECTRUM, t2.WEIGHT_SPECTRUM))  ||  not all(t1.LOFAR_FULL_RES_FLAG = t2.LOFAR_FULL_RES_FLAG)  ||  t1.ANTENNA1 != t2.ANTENNA1  ||  t1.ANTENNA2 != t2.ANTENNA2  ||  t1.TIME !~= t2.TIME' > taql.out
 diff taql.out taql.ref  ||  exit 1
@@ -17,7 +17,7 @@ diff taql.out taql.ref  ||  exit 1
 
 echo; echo "### Test with target projected away."; echo
 rm -rf instrument
-../../src/NDPPP tDemix.parset demix.ignoretarget=false
+NDPPP tDemix.parset demix.ignoretarget=false
 # Compare some columns of the output MS with the reference output.
 $taqlexe 'select from tDemix_out.MS t1, tDemix_ref2.MS t2 where not all(near(t1.DATA,t2.DATA,1e-3) || (isnan(t1.DATA) && isnan(t2.DATA)))  ||  not all(t1.FLAG = t2.FLAG)  ||  not all(near(t1.WEIGHT_SPECTRUM, t2.WEIGHT_SPECTRUM))  ||  not all(t1.LOFAR_FULL_RES_FLAG = t2.LOFAR_FULL_RES_FLAG)  ||  t1.ANTENNA1 != t2.ANTENNA1  ||  t1.ANTENNA2 != t2.ANTENNA2  ||  t1.TIME !~= t2.TIME' > taql.out
 diff taql.out taql.ref  ||  exit 1
@@ -27,7 +27,7 @@ diff taql.out taql.ref  ||  exit 1
 
 echo; echo "### Test with target."; echo
 rm -rf instrument
-../../src/NDPPP tDemix.parset demix.target=CIZA.SP1A.FITS.pbcor_patch_s537 demix.freqstep=32 demix.timestep=5
+NDPPP tDemix.parset demix.target=CIZA.SP1A.FITS.pbcor_patch_s537 demix.freqstep=32 demix.timestep=5
 # Compare some columns of the output MS with the reference output.
 $taqlexe 'select from tDemix_out.MS t1, tDemix_ref3.MS t2 where not all(near(t1.DATA,t2.DATA,1e-3) || (isnan(t1.DATA) && isnan(t2.DATA)))  ||  not all(t1.FLAG = t2.FLAG)  ||  not all(near(t1.WEIGHT_SPECTRUM, t2.WEIGHT_SPECTRUM))  ||  not all(t1.LOFAR_FULL_RES_FLAG = t2.LOFAR_FULL_RES_FLAG)  ||  t1.ANTENNA1 != t2.ANTENNA1  ||  t1.ANTENNA2 != t2.ANTENNA2  ||  t1.TIME !~= t2.TIME' > taql.out
 diff taql.out taql.ref  ||  exit 1

CEP/DP3/DPPP/test/tGainCal.run

@@ -24,12 +24,12 @@ tar zxf ${srcdir}/tGainCal.tab.tgz
 echo "    select result of 0 rows" > taql.ref
 
 echo "Creating MODEL_DATA so that residual can be computed"
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=MODEL_DATA steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.usebeammodel=false
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=MODEL_DATA steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.usebeammodel=false
 
 echo; echo "Test caltype=diagonal"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout= steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-diagonal gaincal.usebeammodel=false gaincal.caltype=diagonal gaincal.propagatesolutions=true gaincal.solint=1
+NDPPP msin=tNDPPP-generic.MS msout= steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-diagonal gaincal.usebeammodel=false gaincal.caltype=diagonal gaincal.propagatesolutions=true gaincal.solint=1
 
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-diagonal
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-diagonal
 
 echo "Comparing the bbs residual with the dppp residual (solutions will not be equal, but residual should be equal). This avoids issues with local minima."
 $taqlexe 'select from (select gsumsqr(sumsqr(abs(iif(t1.FLAG,0,t1.DPPP_DIAGONAL-t1.MODEL_DATA)))) as dpppres, gsumsqr(sumsqr(abs(iif(FLAG,0,t2.BBS_DIAGONAL-t1.MODEL_DATA)))) as bbsres from tNDPPP-generic.MS t1, tGainCal.tab t2) where dpppres>bbsres*1.02' > taql.out
@@ -39,8 +39,8 @@ $taqlexe 'select from tNDPPP-generic.MS where all(FLAG) groupby true having gcou
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test caltype=diagonal with timeslotsperparmupdate=4"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout= steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-diagonal-tpp gaincal.usebeammodel=false gaincal.caltype=diagonal gaincal.solint=4 gaincal.timeslotsperparmupdate=1 gaincal.propagatesolutions=false
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_TPP steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-diagonal-tpp
+NDPPP msin=tNDPPP-generic.MS msout= steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-diagonal-tpp gaincal.usebeammodel=false gaincal.caltype=diagonal gaincal.solint=4 gaincal.timeslotsperparmupdate=1 gaincal.propagatesolutions=false
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_TPP steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-diagonal-tpp
 $taqlexe 'select from tNDPP-generic.MS where not all(near(DPPP_DIAGONAL, DPPP_DIAGONAL_TPP))'
 
 echo "Comparing the difference between applying with timeslotsperparmupdate = default and timeslotsperparmupdate=1"
@@ -51,8 +51,8 @@ $taqlexe 'select from tNDPPP-generic.MS where all(FLAG) groupby true having gcou
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test caltype=fulljones"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_FULLJONES_GAINCAL steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-fulljones gaincal.usebeammodel=false gaincal.caltype=fulljones gaincal.solint=1 gaincal.applysolution=true
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_FULLJONES steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-fulljones
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_FULLJONES_GAINCAL steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-fulljones gaincal.usebeammodel=false gaincal.caltype=fulljones gaincal.solint=1 gaincal.applysolution=true
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_FULLJONES steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-fulljones
 
 echo "Comparing the bbs residual with the dppp residual (solutions will not be equal, but residual should be equal). This avoids issues with local minima."
 $taqlexe 'select from (select gsumsqr(sumsqr(abs(iif(t1.FLAG,0,t1.DPPP_FULLJONES-t1.MODEL_DATA)))) as dpppres, gsumsqr(sumsqr(abs(iif(FLAG,0,t2.BBS_FULLJONES-t1.MODEL_DATA)))) as bbsres from tNDPPP-generic.MS t1, tGainCal.tab t2) where dpppres>bbsres*1.02' > taql.out
@@ -65,8 +65,8 @@ $taqlexe 'select from tNDPPP-generic.MS where all(FLAG) groupby true having gcou
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test caltype=diagonal, nchan=2"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_NCHAN_GAINCAL steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-diagonal-nchan gaincal.usebeammodel=false gaincal.caltype=diagonal gaincal.solint=4 gaincal.nchan=2 gaincal.applysolution=true
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_NCHAN steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-diagonal-nchan
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_NCHAN_GAINCAL steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-diagonal-nchan gaincal.usebeammodel=false gaincal.caltype=diagonal gaincal.solint=4 gaincal.nchan=2 gaincal.applysolution=true
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_NCHAN steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-diagonal-nchan
 
 echo "Comparing the bbs residual with the dppp residual (solutions will not be equal, but residual should be equal). This avoids issues with local minima."
 $taqlexe 'select from (select gsumsqr(sumsqr(abs(iif(t1.FLAG,0,t1.DPPP_DIAGONAL_NCHAN-t1.MODEL_DATA)))) as dpppres, gsumsqr(sumsqr(abs(iif(FLAG,0,t2.BBS_DIAGONAL_NCHAN-t1.MODEL_DATA)))) as bbsres from tNDPPP-generic.MS t1, tGainCal.tab t2) where dpppres>bbsres*1.02' > taql.out
@@ -81,8 +81,8 @@ $taqlexe 'select from tNDPPP-generic.MS where all(FLAG) groupby true having gcou
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test caltype=diagonal, nchan=2, solint=7"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_NCHAN_7_GAINCAL steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-diagonal-nchan gaincal.usebeammodel=false gaincal.caltype=diagonal gaincal.solint=4 gaincal.nchan=2 gaincal.applysolution=true
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_NCHAN_7 steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-diagonal-nchan
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_NCHAN_7_GAINCAL steps=[gaincal] gaincal.sourcedb=tNDPPP-generic.MS/sky gaincal.parmdb=tNDPPP-generic.MS/inst-diagonal-nchan gaincal.usebeammodel=false gaincal.caltype=diagonal gaincal.solint=4 gaincal.nchan=2 gaincal.applysolution=true
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=DPPP_DIAGONAL_NCHAN_7 steps=[applycal] applycal.parmdb=tNDPPP-generic.MS/inst-diagonal-nchan
 
 echo "Comparing the solutions from gaincal + applycal with gaincal directly"
 $taqlexe 'select from tNDPPP-generic.MS where not(all(DPPP_DIAGONAL_NCHAN_7_GAINCAL ~= DPPP_DIAGONAL_NCHAN_7))' > taql.out

CEP/DP3/DPPP/test/tPredict.run

@@ -24,37 +24,37 @@ tar zxf ${srcdir}/tPredict.tab.tgz
 echo "    select result of 0 rows" > taql.ref
 
 echo; echo "Test with beam, subtract"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=MODEL_DATA steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.usebeammodel=true predict.operation=subtract
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=MODEL_DATA steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.usebeammodel=true predict.operation=subtract
 # Compare the MODEL_DATA column of the output MS with the original data minus the BBS reference output.
 $taqlexe 'select from tNDPPP-generic.MS t1, tPredict.tab t2 where not all(near(t1.MODEL_DATA,t1.DATA-t2.PREDICT_beam,5e-2) || (isnan(t1.DATA) && isnan(t2.PREDICT_beam)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test without beam, add"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=MODEL_DATA steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.usebeammodel=false predict.operation=add
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=MODEL_DATA steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.usebeammodel=false predict.operation=add
 # Compare the MODEL_DATA column of the output MS with the original data plus the BBS reference output.
 $taqlexe 'select from tNDPPP-generic.MS t1, tPredict.tab t2 where not all(near(t1.MODEL_DATA,t1.DATA+t2.PREDICT_nobeam,5e-2) || (isnan(t1.DATA) && isnan(t2.PREDICT_beam)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test without beam, with applycal, subtract (like peeling)"; echo
-../../../../ParmDB/src/parmdbm <<EOL
+parmdbm <<EOL
 open table="tPredict.parmdb"
 adddef Gain:0:0:Real values=3.
 adddef Gain:1:1:Real values=3.
 EOL
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=MODEL_DATA steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.applycal.parmdb=tPredict.parmdb predict.operation=subtract
+NDPPP msin=tNDPPP-generic.MS msout=. msout.datacolumn=MODEL_DATA steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.applycal.parmdb=tPredict.parmdb predict.operation=subtract
 # Compare the MODEL_DATA column of the output MS with the original data minus the BBS reference output.
 $taqlexe 'select from tNDPPP-generic.MS t1, tPredict.tab t2 where not all(near(t1.MODEL_DATA,t1.DATA-9.0*t2.PREDICT_nobeam,5e-2) || (isnan(t1.DATA) && isnan(t2.PREDICT_nobeam)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test without beam"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky
+NDPPP msin=tNDPPP-generic.MS msout=. steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky
 # Compare the DATA column of the output MS with the BBS reference output.
 $taqlexe 'select ANTENNA1, ANTENNA2, ctime(TIME), FLAG[0,0], t1.DATA[0,0], t2.PREDICT_nobeam[0,0] from tNDPPP-generic.MS t1, tPredict.tab t2 where not near(t1.DATA[0,0],t2.PREDICT_nobeam[0,0],5e-2)'
 $taqlexe 'select from tNDPPP-generic.MS t1, tPredict.tab t2 where not all(near(t1.DATA,t2.PREDICT_nobeam,5e-2) || (isnan(t1.DATA) && isnan(t2.PREDICT_nobeam)))' > taql.out
 diff taql.out taql.ref  ||  exit 1
 
 echo; echo "Test with beam"; echo
-../../src/NDPPP msin=tNDPPP-generic.MS msout=. steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.usebeammodel=true
+NDPPP msin=tNDPPP-generic.MS msout=. steps=[predict] predict.sourcedb=tNDPPP-generic.MS/sky predict.usebeammodel=true
 # Compare the DATA column of the output MS with the BBS reference output.
 $taqlexe 'select from tNDPPP-generic.MS t1, tPredict.tab t2 where not all(near(t1.DATA,t2.PREDICT_beam,5e-2) || (isnan(t1.DATA) && isnan(t2.PREDICT_beam)))' > taql.out
 diff taql.out taql.ref  ||  exit 1

CEP/DP3/PythonDPPP/test/tPythonStep.run

@@ -20,5 +20,5 @@ export LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 
 # Run NDPPP with the test python step.
-../../DPPP/src/NDPPP msin=tPythonStep_tmp.MS msout=tPythonStep_tmp.msout msout.overwrite=T steps='[pystep,pystep2]' pystep.type=PythonDPPP pystep.python.module=tPythonStep pystep.python.class=tPythonStep pystep.somekey=somevalue pystep2.type=pythondppp pystep2.python.class=tPythonStep pystep2.incr=3.5
+NDPPP msin=tPythonStep_tmp.MS msout=tPythonStep_tmp.msout msout.overwrite=T steps='[pystep,pystep2]' pystep.type=PythonDPPP pystep.python.module=tPythonStep pystep.python.class=tPythonStep pystep.somekey=somevalue pystep2.type=pythondppp pystep2.python.class=tPythonStep pystep2.incr=3.5
 

CEP/LMWCommon/test/tfinddproc.run

@@ -25,10 +25,10 @@
 # $Id$
 
 
-../src/finddproc tfinddproc.in_vd tfinddproc.in_cd
+finddproc tfinddproc.in_vd tfinddproc.in_cd
 echo
-../src/finddproc -dirs /usr/local/xyx0,/usr/local/xyx1 tfinddproc.in_cd
+finddproc -dirs /usr/local/xyx0,/usr/local/xyx1 tfinddproc.in_cd
 echo
-../src/finddproc -ndir 1 -dirs /usr/local/xyx0,/usr/local/xyx1 tfinddproc.in_cd
+finddproc -ndir 1 -dirs /usr/local/xyx0,/usr/local/xyx1 tfinddproc.in_cd
 echo
-../src/finddproc -ndir 5 -dirs /usr/local/xyx0,/usr/local/xyx1 tfinddproc.in_cd
+finddproc -ndir 5 -dirs /usr/local/xyx0,/usr/local/xyx1 tfinddproc.in_cd

CEP/LMWCommon/test/tstartdproc.run

@@ -41,20 +41,20 @@ PATH="$ssdir:$sedir:$curdir:$PATH"
 export PATH
 
 startdistproc -dsn tstartdproc.in_vd -cdn tstartdproc.in_cd \
--mode single -dry -hfn tstartdproc_tmp.out0 -fdp ../src prog1 -arg "a b"
+-mode single -dry -hfn tstartdproc_tmp.out0 prog1 -arg "a b"
 echo "status=$?"
 cat tstartdproc_tmp.out0
 
 echo ''
 startdistproc -dsn tstartdproc.in_vd -cdn tstartdproc.in_cd \
--mode mpi -dry -hfn tstartdproc_tmp.out1 -fdp ../src prog1 -arg "a b"
+-mode mpi -dry -hfn tstartdproc_tmp.out1 prog1 -arg "a b"
 echo "status=$?"
 cat tstartdproc_tmp.out1
 
 echo ''
 startdistproc -useenv "$curdir/tstartdproc_tmp.out2.envfile" \
 -dsn tstartdproc.in_vd -cdn tstartdproc.in_cd \
--mode 3851 -dry -hfn tstartdproc_tmp.out2 -fdp ../src prog1 -arg "a b" \
+-mode 3851 -dry -hfn tstartdproc_tmp.out2 prog1 -arg "a b" \
 > tstartdproc_tmp.log2
 echo "status=$?"
 cat tstartdproc_tmp.out2
@@ -65,7 +65,7 @@ echo ''
 startdistproc -killonfail -useenv "$curdir/tstartdproc_tmp.out3.envfile" \
 -logfile "$curdir/tstartdproc_tmp.log3b" \
 -dsn tstartdproc.in_vd -cdn tstartdproc.in_cd1 -nostartmaster \
--mode 3851 -hfn tstartdproc_tmp.out3 -fdp ../src "`pwd`/tstartdproc.in_run" \
+-mode 3851 -hfn tstartdproc_tmp.out3 "`pwd`/tstartdproc.in_run" \
 > tstartdproc_tmp.log3a
 echo "status=$?"
 cat tstartdproc_tmp.out3

CEP/MS/test/tVdsMaker.run

@@ -10,7 +10,7 @@ sed -e "s%$cwd/%%" tVdsMaker_tmp.ms2.vds
 
 echo ""
 echo "combinevds ..."
-../src/combinevds tVdsMaker_tmp.ms.gds tVdsMaker_tmp.ms1.vds tVdsMaker_tmp.ms2.vds > tVdsMaker_tmp.out1 || exit 1
+combinevds tVdsMaker_tmp.ms.gds tVdsMaker_tmp.ms1.vds tVdsMaker_tmp.ms2.vds > tVdsMaker_tmp.out1 || exit 1
 grep -v "INFO " tVdsMaker_tmp.out1
 # Remove system specific work directory from output.
 sed -e "s%$cwd/%%" tVdsMaker_tmp.ms.gds

CEP/MS/test/tcombinevds.run

@@ -22,7 +22,7 @@
 #
 # $Id$
 
-../src/combinevds tcombinevds_tmp.vdsout tcombinevds.in_vds1 tcombinevds.in_vds2
+combinevds tcombinevds_tmp.vdsout tcombinevds.in_vds1 tcombinevds.in_vds2
 # Keywords Name have absolute paths in their values, so remove them if needed.
 if test "$1" = 1; then
   cat tcombinevds_tmp.vdsout

CEP/ParmDB/test/tParmFacade.run

@@ -23,7 +23,7 @@
 # $Id$
 
 
-../src/parmdbm <<EOF > tParmFacade_tmp.pdbout
+parmdbm <<EOF > tParmFacade_tmp.pdbout
  create tablename='tParmFacade_tmp.pdb'
  add parm1 domain=[1,4,5,10],values=2
  add parm2 type='polc', domain=[1,4,5,10], values=[2,0.1], nx=2

CEP/ParmDB/test/tParmFacadeDistr.run

@@ -30,20 +30,10 @@
 if test "$srcdir" = ""; then
   srcdir=../../../../../LOFAR/CEP/ParmDB/test
 fi
-curdir=`pwd`
-srcdir=`cd $srcdir/../src > /dev/null && pwd`
-exedir=`cd ../src > /dev/null && pwd`
-mwsdir=`cd $srcdir/../../LMWCommon/src > /dev/null && pwd`
-mwedir=`cd ../../LMWCommon/src > /dev/null && pwd`
-
-# Extend PATH.
-PATH=$curdir:$srcdir:$exedir:$mwsdir:$mwedir:$PATH
-export PATH
-
 
 # The test uses 2 remote pdb-s, so create them.
 echo "Filling pdb1"
-../src/parmdbm <<EOF > tParmFacadeDistr_tmp.pdbout
+parmdbm <<EOF > tParmFacadeDistr_tmp.pdbout
  create tablename='tParmFacadeDistr_tmp.pdb1'
  add parm1 domain=[1,4,5,10],values=2
  add parm2 type='polc', domain=[1,4,5,10], values=[2,0.1], nx=2
@@ -55,7 +45,7 @@ if [ $? != 0 ]; then
   exit 1
 fi
 echo "Filling pdb2"
-../src/parmdbm <<EOF > tParmFacadeDistr_tmp.pdbout
+parmdbm <<EOF > tParmFacadeDistr_tmp.pdbout
  create tablename='tParmFacadeDistr_tmp.pdb2'
  add parm1 domain=[7,10,5,10],values=3
  add parm2 type='polc', domain=[7,10,5,10], values=[6,0.3], nx=2

CEP/ParmDB/test/tParmPolc.run

 #!/bin/sh
 
 # Create a ParmDB with a few polcs in it.
-../src/parmdbm <<EOF
+parmdbm <<EOF
 create table='tParmPolc_tmp.pdb'
 add Clock:DE601HBA domain=[0,10,0,10], values=[7.36616e-08,1.28864e-07], ny=2, type='polc'
 add Clock:DE601HBA domain=[0,10,10,20], values=[8.36616e-08,0.28864e-07], ny=2, type='polc'

CEP/ParmDB/test/tSourceDBBlob.run

@@ -3,19 +3,19 @@
 # First make a new SourceDB.
 echo "Creating new file in blob format ..."
 rm -rf tSourceDBBlob_tmp.src
-../src/makesourcedb in=tSourceDBBlob.in format='<' out=tSourceDBBlob_tmp.src outtype=blob append=false
+makesourcedb in=tSourceDBBlob.in format='<' out=tSourceDBBlob_tmp.src outtype=blob append=false
 ./tSourceDBBlob
 
 # Append to the SourceDB.
 echo
 echo "Appending to file ..."
-../src/makesourcedb in=tSourceDBBlob.in format='<' out=tSourceDBBlob_tmp.src outtype=blob append=true
+makesourcedb in=tSourceDBBlob.in format='<' out=tSourceDBBlob_tmp.src outtype=blob append=true
 ./tSourceDBBlob
 
 # First make a new SourceDB.
 echo
 echo "Creating new file in casa format ..."
 rm -rf tSourceDBBlob_tmp.src
-../src/makesourcedb in=tSourceDBBlob.in format='<' out=tSourceDBBlob_tmp.src append=false
+makesourcedb in=tSourceDBBlob.in format='<' out=tSourceDBBlob_tmp.src append=false
 ./tSourceDBBlob
 

CEP/ParmDB/test/tSourceDBBlob.stdout

 Creating new file in blob format ...
-../src/makesourcedb: Version GvD 2013-May-16
+makesourcedb: Version GvD 2013-May-16
 Wrote 0 patches (out of 0) and 5 sources (out of 5) into tSourceDBBlob_tmp.src
 
 Source name:    sun
@@ -142,7 +142,7 @@ Patch names: []
 Patch names: [cygnus,cygnusA,lena]
 
 Appending to file ...
-../src/makesourcedb: Version GvD 2013-May-16
+makesourcedb: Version GvD 2013-May-16
 Wrote 0 patches (out of 0) and 5 sources (out of 5) into tSourceDBBlob_tmp.src
 
 Source name:    sun
@@ -417,7 +417,7 @@ Patch names: []
 Patch names: [cygnus,cygnusA,lena]
 
 Creating new file in casa format ...
-../src/makesourcedb: Version GvD 2013-May-16
+makesourcedb: Version GvD 2013-May-16
 Wrote 0 patches (out of 0) and 5 sources (out of 5) into tSourceDBBlob_tmp.src
 
 Source name:    sun

CEP/ParmDB/test/tmakesourcedb.run

@@ -24,8 +24,8 @@
 
 # Remove the Version line from the output because it is system dependent.
 echo "test 1 ..."
-../src/makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 format="< " | grep -v ' Version '
-../src/parmdbm tmakesourcedb_tmp.stdout > /dev/null <<EOF
+makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 format="< " | grep -v ' Version '
+parmdbm tmakesourcedb_tmp.stdout > /dev/null <<EOF
 open tablename='tmakesourcedb_tmp.sdb'
 showdef
 EOF
@@ -33,8 +33,8 @@ cat tmakesourcedb_tmp.stdout
 
 echo ""
 echo "test 2 ..."
-../src/makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 format="category=fixed'1',Name,Type,RefType,Ra,Dec,I,Q,U,V,SpectralIndex='0.5',ReferenceFrequency='1e9',MajorAxis,MinorAxis,Orientation" patchprefix='p_' patchsuffix='-suf' | grep -v ' Version '
-../src/parmdbm tmakesourcedb_tmp.stdout > /dev/null <<EOF
+makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 format="category=fixed'1',Name,Type,RefType,Ra,Dec,I,Q,U,V,SpectralIndex='0.5',ReferenceFrequency='1e9',MajorAxis,MinorAxis,Orientation" patchprefix='p_' patchsuffix='-suf' | grep -v ' Version '
+parmdbm tmakesourcedb_tmp.stdout > /dev/null <<EOF
 open tablename='tmakesourcedb_tmp.sdb'
 showdef
 EOF
@@ -42,8 +42,8 @@ cat tmakesourcedb_tmp.stdout
 
 echo ""
 echo "test 3 ..."
-../src/makesourcedb in=tmakesourcedb.in_1 out=tmakesourcedb_tmp.sdb1 append=0 average=0 format="<" | grep -v ' Version '
-../src/parmdbm tmakesourcedb_tmp.stdout > /dev/null <<EOF
+makesourcedb in=tmakesourcedb.in_1 out=tmakesourcedb_tmp.sdb1 append=0 average=0 format="<" | grep -v ' Version '
+parmdbm tmakesourcedb_tmp.stdout > /dev/null <<EOF
 open tablename='tmakesourcedb_tmp.sdb1'
 showdef
 EOF
@@ -51,8 +51,8 @@ cat tmakesourcedb_tmp.stdout
 
 echo ""
 echo "test 4 ..."
-../src/makesourcedb in=tmakesourcedb.in_2 out=tmakesourcedb_tmp.sdb append=0 average=1 format="category=fixed'3', patch=fixed'patch1' Name Type Rah ram ras Decd : decm : decs I, Q, U, V, SpectralIndex=fixed'[1.5,0.01]', ReferenceFrequency=fixed'60e6', MajorAxis, MinorAxis, Orientation, Parm1, RotationMeasure, PolarizationAngle, PolarizedFraction, a0:b=fixed'3.0'" | grep -v ' Version '
-../src/parmdbm tmakesourcedb_tmp.stdout > /dev/null <<EOF
+makesourcedb in=tmakesourcedb.in_2 out=tmakesourcedb_tmp.sdb append=0 average=1 format="category=fixed'3', patch=fixed'patch1' Name Type Rah ram ras Decd : decm : decs I, Q, U, V, SpectralIndex=fixed'[1.5,0.01]', ReferenceFrequency=fixed'60e6', MajorAxis, MinorAxis, Orientation, Parm1, RotationMeasure, PolarizationAngle, PolarizedFraction, a0:b=fixed'3.0'" | grep -v ' Version '
+parmdbm tmakesourcedb_tmp.stdout > /dev/null <<EOF
 open tablename='tmakesourcedb_tmp.sdb'
 showdef
 EOF
@@ -87,9 +87,9 @@ fi
 echo "<<<"
 exit 0
 # Select using a cone
-../src/makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 average=0 format="," center="" center="23deg,45.0.0.00" radius="1arcsec" | grep -v ' Version '
-../src/makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 average=0 format="," center="" center="23deg,45.0.2.00" radius="1.9arcsec" | grep -v ' Version '
-../src/makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 average=0 format="," center="" center="23deg,45.0.0.00" width="1arcsec" | grep -v ' Version '
-../src/makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 average=0 format="," center="" center="23deg,45.0.2.00" width="10arcmin,4.1arcsec" | grep -v ' Version '
-../src/makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append= average=00 format="," center="" center="23deg,45.0.2.00" width="10arcmin,3.9arcsec" | grep -v ' Version '
+makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 average=0 format="," center="" center="23deg,45.0.0.00" radius="1arcsec" | grep -v ' Version '
+makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 average=0 format="," center="" center="23deg,45.0.2.00" radius="1.9arcsec" | grep -v ' Version '
+makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 average=0 format="," center="" center="23deg,45.0.0.00" width="1arcsec" | grep -v ' Version '
+makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append=0 average=0 format="," center="" center="23deg,45.0.2.00" width="10arcmin,4.1arcsec" | grep -v ' Version '
+makesourcedb in=tmakesourcedb.in out=tmakesourcedb_tmp.sdb append= average=00 format="," center="" center="23deg,45.0.2.00" width="10arcmin,3.9arcsec" | grep -v ' Version '
 

CEP/ParmDB/test/tmergesourcedb.run

@@ -26,40 +26,40 @@ rm -rf tmergesourcedb_tmp.sdb*
 
 # Remove the Version line from the output because it is system dependent.
 echo "create sourcedb-s ..."
-../src/makesourcedb in=tmergesourcedb.in_1 out=tmergesourcedb_tmp.sdbc1 append=0 outtype=casa format="< " | grep -v ' Version '
-../src/makesourcedb in=tmergesourcedb.in_2 out=tmergesourcedb_tmp.sdbc2 append=0 outtype=casa format="< " | grep -v ' Version '
-../src/showsourcedb in=tmergesourcedb_tmp.sdbc1 | grep -v ' Version '
-../src/showsourcedb in=tmergesourcedb_tmp.sdbc2 | grep -v ' Version '
+makesourcedb in=tmergesourcedb.in_1 out=tmergesourcedb_tmp.sdbc1 append=0 outtype=casa format="< " | grep -v ' Version '
+makesourcedb in=tmergesourcedb.in_2 out=tmergesourcedb_tmp.sdbc2 append=0 outtype=casa format="< " | grep -v ' Version '
+showsourcedb in=tmergesourcedb_tmp.sdbc1 | grep -v ' Version '
+showsourcedb in=tmergesourcedb_tmp.sdbc2 | grep -v ' Version '
 
 # Merge the two sdb-s and show the result.
 echo "test merge mode=match ..."
-../src/mergesourcedb in1=tmergesourcedb_tmp.sdbc1 in2=tmergesourcedb_tmp.sdbc2 out=tmergesourcedb_tmp.sdbcm outtype=casa append=0 mode=match | grep -v ' Version '
-../src/showsourcedb in=tmergesourcedb_tmp.sdbcm | grep -v ' Version '
+mergesourcedb in1=tmergesourcedb_tmp.sdbc1 in2=tmergesourcedb_tmp.sdbc2 out=tmergesourcedb_tmp.sdbcm outtype=casa append=0 mode=match | grep -v ' Version '
+showsourcedb in=tmergesourcedb_tmp.sdbcm | grep -v ' Version '
 
 echo
 echo "test mode=all ..."
 # Merge the two sdb-s and show the result.
-../src/mergesourcedb in1=tmergesourcedb_tmp.sdbc1 in2=tmergesourcedb_tmp.sdbc2 out=tmergesourcedb_tmp.sdbca append=0 mode=all | grep -v ' Version '
-../src/showsourcedb in=tmergesourcedb_tmp.sdbca | grep -v ' Version '
+mergesourcedb in1=tmergesourcedb_tmp.sdbc1 in2=tmergesourcedb_tmp.sdbc2 out=tmergesourcedb_tmp.sdbca append=0 mode=all | grep -v ' Version '
+showsourcedb in=tmergesourcedb_tmp.sdbca | grep -v ' Version '
 
 # Now do the same for blob mode.
 echo
 echo "create sourcedb-s ..."
-../src/makesourcedb in=tmergesourcedb.in_1 out=tmergesourcedb_tmp.sdbb1 append=0 outtype=blob format="< " | grep -v ' Version '
-../src/makesourcedb in=tmergesourcedb.in_2 out=tmergesourcedb_tmp.sdbb2 append=0 outtype=blob format="< " | grep -v ' Version '
-../src/showsourcedb in=tmergesourcedb_tmp.sdbb1 | grep -v ' Version '
-../src/showsourcedb in=tmergesourcedb_tmp.sdbb2 | grep -v ' Version '
+makesourcedb in=tmergesourcedb.in_1 out=tmergesourcedb_tmp.sdbb1 append=0 outtype=blob format="< " | grep -v ' Version '
+makesourcedb in=tmergesourcedb.in_2 out=tmergesourcedb_tmp.sdbb2 append=0 outtype=blob format="< " | grep -v ' Version '
+showsourcedb in=tmergesourcedb_tmp.sdbb1 | grep -v ' Version '
+showsourcedb in=tmergesourcedb_tmp.sdbb2 | grep -v ' Version '
 
 # Merge the two sdb-s and show the result.
 echo "test merge mode=match ..."
-../src/mergesourcedb in1=tmergesourcedb_tmp.sdbb1 in2=tmergesourcedb_tmp.sdbb2 out=tmergesourcedb_tmp.sdbbm outtype=blob append=0 mode=match | grep -v ' Version '
-../src/showsourcedb in=tmergesourcedb_tmp.sdbbm | grep -v ' Version '
+mergesourcedb in1=tmergesourcedb_tmp.sdbb1 in2=tmergesourcedb_tmp.sdbb2 out=tmergesourcedb_tmp.sdbbm outtype=blob append=0 mode=match | grep -v ' Version '
+showsourcedb in=tmergesourcedb_tmp.sdbbm | grep -v ' Version '
 
 echo
 echo "test mode=all ..."
 # Merge the two sdb-s and show the result.
-../src/mergesourcedb in1=tmergesourcedb_tmp.sdbb1 in2=tmergesourcedb_tmp.sdbb2 out=tmergesourcedb_tmp.sdbba outtype=blob append=0 mode=all | grep -v ' Version '
-../src/showsourcedb in=tmergesourcedb_tmp.sdbba | grep -v ' Version '
+mergesourcedb in1=tmergesourcedb_tmp.sdbb1 in2=tmergesourcedb_tmp.sdbb2 out=tmergesourcedb_tmp.sdbba outtype=blob append=0 mode=all | grep -v ' Version '
+showsourcedb in=tmergesourcedb_tmp.sdbba | grep -v ' Version '
 
 exit 0
 

CEP/ParmDB/test/tparmdb.run

@@ -23,6 +23,6 @@
 # $Id$
 
 
-../src/parmdbm tparmdb_tmp.stdout < tparmdb.in > /dev/null
+parmdbm tparmdb_tmp.stdout < tparmdb.in > /dev/null
 cat tparmdb_tmp.stdout
 #sed -e '/Assertion: /d' tparmdb_tmp.outtmp

CEP/ParmDB/test/tparmexportcal.run

@@ -24,7 +24,7 @@
 
 showparms()
 {
-  ../src/parmdbm tparmexportcal_tmp.stdout > /dev/null << EOF
+  parmdbm tparmexportcal_tmp.stdout > /dev/null << EOF
    open tablename='tparmexportcal_tmp.pdb2'
    showdef
    show
@@ -35,7 +35,7 @@ EOF
 }
 
 # Create the ParmDB to be exported.
-../src/parmdbm tparmexportcal_tmp.stdout > /dev/null << EOF
+parmdbm tparmexportcal_tmp.stdout > /dev/null << EOF
  create tablename='tparmexportcal_tmp.pdb'
  add Gain:S1:Real:1 nx=2,ny=1,values=[0.1, 0.2], domain=[1,3,2,4]
  add Gain:S1:Imag:1 nx=2,ny=1,values=[  1,   2], domain=[1,3,2,4]
@@ -46,17 +46,17 @@ grep -v ": Version " tparmexportcal_tmp.stdout
 
 # Export in standard way and show result.
 echo ""
-../src/parmexportcal in=tparmexportcal_tmp.pdb out=tparmexportcal_tmp.pdb2 | grep -v ": Version " | grep -v "INFO "
+parmexportcal in=tparmexportcal_tmp.pdb out=tparmexportcal_tmp.pdb2 | grep -v ": Version " | grep -v "INFO "
 showparms
 
 # Export in as ampl/phase way and show result.
 echo ""
-../src/parmexportcal in=tparmexportcal_tmp.pdb out=tparmexportcal_tmp.pdb2 type=polar | grep -v ": Version " | grep -v "INFO "
+parmexportcal in=tparmexportcal_tmp.pdb out=tparmexportcal_tmp.pdb2 type=polar | grep -v ": Version " | grep -v "INFO "
 showparms
 
 # Create another ParmDB to be exported.
 echo ""
-../src/parmdbm tparmexportcal_tmp.stdout > /dev/null << EOF
+parmdbm tparmexportcal_tmp.stdout > /dev/null << EOF
  create tablename='tparmexportcal_tmp.pdb'
  add Gain:S1:Phase:1 ny=2,values=[0.1, 0.2], domain=[1,3,2,4]
  add Gain:S1:Ampl:1 ny=2,values=[  1,   2], domain=[1,3,2,4]
@@ -67,11 +67,11 @@ grep -v ": Version " tparmexportcal_tmp.stdout
 
 # Export in standard way and show result.
 echo ""
-../src/parmexportcal in=tparmexportcal_tmp.pdb out=tparmexportcal_tmp.pdb2 zerophase=true | grep -v ": Version " | grep -v "INFO "
+parmexportcal in=tparmexportcal_tmp.pdb out=tparmexportcal_tmp.pdb2 zerophase=true | grep -v ": Version " | grep -v "INFO "
 showparms
 
 # Export in as sin/cos way and show result.
 echo ""
-../src/parmexportcal in=tparmexportcal_tmp.pdb out=tparmexportcal_tmp.pdb2 type=complex | grep -v ": Version " | grep -v "INFO "
+parmexportcal in=tparmexportcal_tmp.pdb out=tparmexportcal_tmp.pdb2 type=complex | grep -v ": Version " | grep -v "INFO "
 showparms
 

CMake/testscripts/runctest.sh.in

@@ -26,7 +26,7 @@
 srcdir="@srcdir@"; export srcdir
 
 # Add the bin directory in the build tree to PATH
-PATH="@CMAKE_BINARY_DIR@/bin:${PATH}"; export PATH
+PATH="@CMAKE_BINARY_DIR@/sbin:@CMAKE_BINARY_DIR@/bin:${PATH}"; export PATH
 
 # Add the Python build directory to PYTHONPATH.
 PYTHONPATH="@srcdir@:@PYTHON_BUILD_DIR@:${PYTHONPATH}"; export PYTHONPATH