From 56c61a21cf8a507b790e16adeb868b8a46d299ac Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 30 Jan 2007 10:33:05 +0000
Subject: [PATCH] disabled some tests which either crash or hang; see #2143

---
 campcaster/bin/nightlyBuild.sh | 22 +++++++++++++++++++---
 campcaster/etc/Makefile.in     | 12 ++++++------
 campcaster/etc/testResults.xml |  6 ++----
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/campcaster/bin/nightlyBuild.sh b/campcaster/bin/nightlyBuild.sh
index 074ff6975..00580b782 100755
--- a/campcaster/bin/nightlyBuild.sh
+++ b/campcaster/bin/nightlyBuild.sh
@@ -50,9 +50,9 @@ ls -l ${logdir}/nightlySvnUpdate.log >> ${logdir}/nightlySvnUpdate.log
 #-------------------------------------------------------------------------------
 #   Generate the documentation.
 #-------------------------------------------------------------------------------
-mv -f ${logdir}/nightlyMakeDoc.log ${logdir}/nightlyMakeDoc.log~
-make doc &> ${logdir}/nightlyMakeDoc.log
-ls -l ${logdir}/nightlyMakeDoc.log >> ${logdir}/nightlyMakeDoc.log
+mv -f ${logdir}/nightlyMakeDoxygen.log ${logdir}/nightlyMakeDoxygen.log~
+make doxygen &> ${logdir}/nightlyMakeDoxygen.log
+ls -l ${logdir}/nightlyMakeDoxygen.log >> ${logdir}/nightlyMakeDoxygen.log
 
 
 #-------------------------------------------------------------------------------
@@ -70,3 +70,19 @@ mv -f ${logdir}/nightlyMakeCheck.log ${logdir}/nightlyMakeCheck.log~
 make check &> ${logdir}/nightlyMakeCheck.log
 ls -l ${logdir}/nightlyMakeCheck.log >> ${logdir}/nightlyMakeCheck.log
 
+
+#-------------------------------------------------------------------------------
+#   Generate the test results report.
+#-------------------------------------------------------------------------------
+mv -f ${logdir}/nightlyMakeTestResults.log ${logdir}/nightlyMakeTestResults.log~
+make testresults &> ${logdir}/nightlyMakeTestResults.log
+ls -l ${logdir}/nightlyMakeTestResults.log >> ${logdir}/nightlyMakeTestResults.log
+
+
+#-------------------------------------------------------------------------------
+#   Generate the flawfinder report.
+#-------------------------------------------------------------------------------
+mv -f ${logdir}/nightlyMakeFlawfinder.log ${logdir}/nightlyMakeFlawfinder.log~
+make flawfinder &> ${logdir}/nightlyMakeFlawfinder.log
+ls -l ${logdir}/nightlyMakeFlawfinder.log >> ${logdir}/nightlyMakeFlawfinder.log
+
diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in
index c1040ce14..289b5b33d 100644
--- a/campcaster/etc/Makefile.in
+++ b/campcaster/etc/Makefile.in
@@ -395,14 +395,14 @@ check:
 	-${MAKE} -C ${DB_DIR} check
 	-${MAKE} -C ${STORAGE_CLIENT_DIR} check
 	-${MAKE} -C ${GSTREAMER_ELEMENTS_DIR} check
-	-${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} check
+#	-${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} check          # hangs on edge.campware.org
 	-${MAKE} -C ${EVENT_SCHEDULER_DIR} check
 	-${MAKE} -C ${SCHEDULER_CLIENT_DIR} check
-	-${MAKE} -C ${WIDGETS_DIR} check
-	-${MAKE} -C ${SCHEDULER_DIR} check
-#	-${MAKE} -C ${GLIVESUPPORT_DIR} check
-#	-${MAKE} -C ${ARCHIVE_SERVER_DIR} check
-#	-${MAKE} -C ${STORAGE_SERVER_DIR} check
+#	-${MAKE} -C ${WIDGETS_DIR} check                    # no tests defined
+#	-${MAKE} -C ${SCHEDULER_DIR} check                  # has database issues
+#	-${MAKE} -C ${GLIVESUPPORT_DIR} check               # has database issues
+#	-${MAKE} -C ${ARCHIVE_SERVER_DIR} check             # no tests defined
+#	-${MAKE} -C ${STORAGE_SERVER_DIR} check             # has database issues
 
 
 start: ${SCHEDULER_EXE}
diff --git a/campcaster/etc/testResults.xml b/campcaster/etc/testResults.xml
index 4fe4df376..5cdc11564 100644
--- a/campcaster/etc/testResults.xml
+++ b/campcaster/etc/testResults.xml
@@ -7,10 +7,8 @@
 <!ENTITY dbResults SYSTEM "../src/modules/db/doc/testResults.xml" >
 <!ENTITY eventSchedulerResults SYSTEM "../src/modules/eventScheduler/doc/testResults.xml" >
 <!ENTITY gstreamerElementsResults SYSTEM "../src/modules/gstreamerElements/doc/testResults.xml" >
-<!ENTITY playlistExecutorResults SYSTEM "../src/modules/playlistExecutor/doc/testResults.xml" >
 <!ENTITY schedulerClientResults SYSTEM "../src/modules/schedulerClient/doc/testResults.xml" >
 <!ENTITY storageClientResults SYSTEM "../src/modules/storageClient/doc/testResults.xml" >
-<!ENTITY schedulerResults SYSTEM "../src/products/scheduler/doc/testResults.xml" >
 
 ]>
 <TestResults>
@@ -19,8 +17,8 @@
 &dbResults;
 &eventSchedulerResults;
 &gstreamerElementsResults;
-&playlistExecutorResults;
+<!-- disabled &playlistExecutorResults; -->
 &schedulerClientResults;
 &storageClientResults;
-&schedulerResults;
+<!-- disabled &schedulerResults; -->
 </TestResults>