From 0071e5ae409a6bfdc6bfb4ae5efbc6ee6afff2e6 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Mon, 24 Jul 2006 11:58:20 +0000
Subject: [PATCH] BugID: 61
Use argument `-stdout' in call to assay to force check of presence of
reference output file. This solution supersedes the `return 2' option.
---
LCS/AMC/AMCBase/test/tConverterCommand.cc | 2 +-
LCS/AMC/AMCBase/test/tConverterCommand.sh | 2 +-
LCS/AMC/AMCBase/test/tConverterStatus.cc | 2 +-
LCS/AMC/AMCBase/test/tConverterStatus.sh | 2 +-
LCS/AMC/AMCBase/test/tDirection.cc | 2 +-
LCS/AMC/AMCBase/test/tDirection.sh | 2 +-
LCS/AMC/AMCBase/test/tPosition.cc | 2 +-
LCS/AMC/AMCBase/test/tPosition.sh | 2 +-
LCS/AMC/AMCImpl/test/tConverter.cc | 2 +-
LCS/AMC/AMCImpl/test/tConverter.sh | 4 ++--
LCS/Common/test/Makefile.am | 6 +-----
LCS/Common/test/tNumeric.cc | 2 +-
LCS/Common/test/tNumeric.sh | 2 +-
LCS/Common/test/tProcess.cc | 2 +-
LCS/Common/test/tProcess.sh | 2 +-
LCS/Common/test/tProcess.stdout | 1 -
16 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/LCS/AMC/AMCBase/test/tConverterCommand.cc b/LCS/AMC/AMCBase/test/tConverterCommand.cc
index 59e5023dd3b..1a7cc479d9a 100644
--- a/LCS/AMC/AMCBase/test/tConverterCommand.cc
+++ b/LCS/AMC/AMCBase/test/tConverterCommand.cc
@@ -77,5 +77,5 @@ int main(int /*argc*/, const char* const argv[])
cerr << e << endl;
return 1;
}
- return 2; // forces assay to flag missing .stdout file as an error
+ return 0;
}
diff --git a/LCS/AMC/AMCBase/test/tConverterCommand.sh b/LCS/AMC/AMCBase/test/tConverterCommand.sh
index f9de3e91720..36593812169 100755
--- a/LCS/AMC/AMCBase/test/tConverterCommand.sh
+++ b/LCS/AMC/AMCBase/test/tConverterCommand.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-$lofar_sharedir/runtest.sh tConverterCommand 2>&1 > tConverterCommand.log
+$lofar_sharedir/runtest.sh -stdout tConverterCommand 2>&1 > tConverterCommand.log
diff --git a/LCS/AMC/AMCBase/test/tConverterStatus.cc b/LCS/AMC/AMCBase/test/tConverterStatus.cc
index 7e4acc8be8a..60cc8ecedff 100644
--- a/LCS/AMC/AMCBase/test/tConverterStatus.cc
+++ b/LCS/AMC/AMCBase/test/tConverterStatus.cc
@@ -66,5 +66,5 @@ int main(int /*argc*/, const char* const argv[])
cerr << e << endl;
return 1;
}
- return 2; // forces assay to flag missing .stdout file as an error
+ return 0;
}
diff --git a/LCS/AMC/AMCBase/test/tConverterStatus.sh b/LCS/AMC/AMCBase/test/tConverterStatus.sh
index 9dc1e69f292..319b14b18d8 100755
--- a/LCS/AMC/AMCBase/test/tConverterStatus.sh
+++ b/LCS/AMC/AMCBase/test/tConverterStatus.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-$lofar_sharedir/runtest.sh tConverterStatus 2>&1 > tConverterStatus.log
+$lofar_sharedir/runtest.sh -stdout tConverterStatus 2>&1 > tConverterStatus.log
diff --git a/LCS/AMC/AMCBase/test/tDirection.cc b/LCS/AMC/AMCBase/test/tDirection.cc
index 55d0ce79c4d..53f330e16f2 100644
--- a/LCS/AMC/AMCBase/test/tDirection.cc
+++ b/LCS/AMC/AMCBase/test/tDirection.cc
@@ -102,5 +102,5 @@ int main(int /*argc*/, const char* argv[])
return 1;
}
- return 2; // forces assay to flag missing .stdout file as an error
+ return 0;
}
diff --git a/LCS/AMC/AMCBase/test/tDirection.sh b/LCS/AMC/AMCBase/test/tDirection.sh
index f8ca9a21cde..e30277208db 100755
--- a/LCS/AMC/AMCBase/test/tDirection.sh
+++ b/LCS/AMC/AMCBase/test/tDirection.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-$lofar_sharedir/runtest.sh tDirection 2>&1 > tDirection.log
+$lofar_sharedir/runtest.sh -stdout tDirection 2>&1 > tDirection.log
diff --git a/LCS/AMC/AMCBase/test/tPosition.cc b/LCS/AMC/AMCBase/test/tPosition.cc
index 320932f8a3a..dc8c07399b4 100644
--- a/LCS/AMC/AMCBase/test/tPosition.cc
+++ b/LCS/AMC/AMCBase/test/tPosition.cc
@@ -179,5 +179,5 @@ int main(int, const char* argv[])
return 1;
}
- return 2; // forces assay to flag missing .stdout file as an error
+ return 0;
}
diff --git a/LCS/AMC/AMCBase/test/tPosition.sh b/LCS/AMC/AMCBase/test/tPosition.sh
index d1875c269a3..ae5e487759d 100755
--- a/LCS/AMC/AMCBase/test/tPosition.sh
+++ b/LCS/AMC/AMCBase/test/tPosition.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-$lofar_sharedir/runtest.sh tPosition 2>&1 > tPosition.log
+$lofar_sharedir/runtest.sh -stdout tPosition 2>&1 > tPosition.log
diff --git a/LCS/AMC/AMCImpl/test/tConverter.cc b/LCS/AMC/AMCImpl/test/tConverter.cc
index afc1990985c..ad01621c9fe 100644
--- a/LCS/AMC/AMCImpl/test/tConverter.cc
+++ b/LCS/AMC/AMCImpl/test/tConverter.cc
@@ -392,5 +392,5 @@ int main(int /*argc*/, const char* const argv[])
return 1;
}
- return 2; // forces assay to flag missing .stdout file as an error
+ return 0;
}
diff --git a/LCS/AMC/AMCImpl/test/tConverter.sh b/LCS/AMC/AMCImpl/test/tConverter.sh
index 38d806a29b6..ee5e7dda5b8 100755
--- a/LCS/AMC/AMCImpl/test/tConverter.sh
+++ b/LCS/AMC/AMCImpl/test/tConverter.sh
@@ -1,5 +1,5 @@
#!/bin/sh
echo "impl" > tConverter.in
-$lofar_sharedir/runtest.sh tConverter > tConverter_impl.log
+$lofar_sharedir/runtest.sh -stdout tConverter > tConverter_impl.log
echo "client localhost 31339" > tConverter.in
-$lofar_sharedir/runtest.sh tConverter > tConverter_client.log
+$lofar_sharedir/runtest.sh -stdout tConverter > tConverter_client.log
diff --git a/LCS/Common/test/Makefile.am b/LCS/Common/test/Makefile.am
index 340928e2611..74244bae63e 100644
--- a/LCS/Common/test/Makefile.am
+++ b/LCS/Common/test/Makefile.am
@@ -1,5 +1,5 @@
check_PROGRAMS = testLogger \
- tAllocator tDataConvert tDeployment tFileLocator \
+ tAllocator tDataConvert tFileLocator \
tStringUtil tHexdump testSocket tComplex tProcess \
tRunOnNode tTimer tNumeric
@@ -50,10 +50,6 @@ tDataConvert_SOURCES = tDataConvert.cc
tDataConvert_LDADD = ../src/libcommon.la
tDataConvert_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-tDeployment_SOURCES = tDeployment.cc
-tDeployment_LDADD = ../src/libcommon.la
-tDeployment_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
-
tFileLocator_SOURCES = tFileLocator.cc
tFileLocator_LDADD = ../src/libcommon.la
tFileLocator_DEPENDENCIES = ../src/libcommon.la $(LOFAR_DEPEND)
diff --git a/LCS/Common/test/tNumeric.cc b/LCS/Common/test/tNumeric.cc
index 579942c2833..88334c1d75a 100644
--- a/LCS/Common/test/tNumeric.cc
+++ b/LCS/Common/test/tNumeric.cc
@@ -392,5 +392,5 @@ int main(int /*argc*/, const char* argv[])
return 1;
}
LOG_INFO("Program terminated successfully");
- return 2; // forces assay to flag missing .stdout file as an error
+ return 0;
}
diff --git a/LCS/Common/test/tNumeric.sh b/LCS/Common/test/tNumeric.sh
index f80ddad6e11..3757c30f0a9 100755
--- a/LCS/Common/test/tNumeric.sh
+++ b/LCS/Common/test/tNumeric.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-$lofar_sharedir/runtest.sh tNumeric 2>&1 > tNumeric_test.log
+$lofar_sharedir/runtest.sh -stdout tNumeric 2>&1 > tNumeric_test.log
diff --git a/LCS/Common/test/tProcess.cc b/LCS/Common/test/tProcess.cc
index dc3c2dfc198..c98ea907f3d 100644
--- a/LCS/Common/test/tProcess.cc
+++ b/LCS/Common/test/tProcess.cc
@@ -94,5 +94,5 @@ int main (int /*argc*/, const char* argv[])
return 1;
}
- return 2; // forces assay to flag missing .stdout file as an error
+ return 0;
}
diff --git a/LCS/Common/test/tProcess.sh b/LCS/Common/test/tProcess.sh
index ef0d4581cb5..31efb1b6387 100755
--- a/LCS/Common/test/tProcess.sh
+++ b/LCS/Common/test/tProcess.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-$lofar_sharedir/runtest.sh tProcess 2>&1 > tProcess.log
+$lofar_sharedir/runtest.sh -stdout tProcess 2>&1 > tProcess.log
diff --git a/LCS/Common/test/tProcess.stdout b/LCS/Common/test/tProcess.stdout
index 9ef39553e79..d2fdf9d567e 100644
--- a/LCS/Common/test/tProcess.stdout
+++ b/LCS/Common/test/tProcess.stdout
@@ -1,3 +1,2 @@
S
-S
Z
--
GitLab