ChangeLogTag:Sun Dec 2 12:44:58 2001 Carlos O'Ryan <coryan@uci.edu>

11 files changed, 141 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index 456c67d4f49..7c86db45528 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Sun Dec  2 12:44:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* tests/ACE_Init_Test.cpp:
+	* tests/ACE_Init_TestDlg.cpp:
+	  Protect this test against compilation on non-Win32 platforms,
+	  that makes it easier to compile using samwise.
+
+	* tests/RMCast/RMCast_Fragment_Test.cpp:
+	* tests/RMCast/RMCast_Membership_Test.cpp:
+	* tests/RMCast/RMCast_Reassembly_Test.cpp:
+	* tests/RMCast/RMCast_Reordering_Test.cpp:
+	* tests/RMCast/RMCast_Retransmission_Test.cpp:
+	* tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp:
+	  Change #include "test_config.h" to #include "../test_config.h",
+	  it is easier to generate makefiles and projects files with
+	  samwise if we do that.
+
 Sun Dec 02 12:15:25 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* ace/OS.cpp: 
@@ -10,7 +27,7 @@ Sun Dec  2 12:17:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* ace/Reactor.i: Fixed a warning in TRU 64. Thanks to
 	  <krumpo@pobox.sk>  which reminded me of the fix in one of my
 	  workspaces. This shows up only in V6.3-013 (cxx) of the
-	  compiler.  
+	  compiler.
 
 Sat Dec  1 19:39:22 2001  Steve Huston  <shuston@riverace.com>
 
@@ -41,7 +58,7 @@ Sat Dec  1 18:03:51 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 	  Added support so that ACE will build and run on Mac OS X 10.1.
   	  Thanks to John Michael Zorko <j.zorko@att.net> for contributing
  	  this.
-	
+
 Fri Nov 30 19:08:19 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/ARGV.cpp (dump): Fixed a bug with dump() so that it
@@ -76,7 +93,7 @@ Wed Nov 28 17:44:26 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 	  ACE_OS::stat().  Thanks to Christopher Kohlhoff
  	  <chris@kohlhoff.com> and Chris Able <cable@scires.com> for
  	  reporting/fixing this.
-  
+
 Sat Dec 01 09:26:27 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.2.1 released.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 456c67d4f49..7c86db45528 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,20 @@
+Sun Dec  2 12:44:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* tests/ACE_Init_Test.cpp:
+	* tests/ACE_Init_TestDlg.cpp:
+	  Protect this test against compilation on non-Win32 platforms,
+	  that makes it easier to compile using samwise.
+
+	* tests/RMCast/RMCast_Fragment_Test.cpp:
+	* tests/RMCast/RMCast_Membership_Test.cpp:
+	* tests/RMCast/RMCast_Reassembly_Test.cpp:
+	* tests/RMCast/RMCast_Reordering_Test.cpp:
+	* tests/RMCast/RMCast_Retransmission_Test.cpp:
+	* tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp:
+	  Change #include "test_config.h" to #include "../test_config.h",
+	  it is easier to generate makefiles and projects files with
+	  samwise if we do that.
+
 Sun Dec 02 12:15:25 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* ace/OS.cpp: 
@@ -10,7 +27,7 @@ Sun Dec  2 12:17:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* ace/Reactor.i: Fixed a warning in TRU 64. Thanks to
 	  <krumpo@pobox.sk>  which reminded me of the fix in one of my
 	  workspaces. This shows up only in V6.3-013 (cxx) of the
-	  compiler.  
+	  compiler.
 
 Sat Dec  1 19:39:22 2001  Steve Huston  <shuston@riverace.com>
 
@@ -41,7 +58,7 @@ Sat Dec  1 18:03:51 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 	  Added support so that ACE will build and run on Mac OS X 10.1.
   	  Thanks to John Michael Zorko <j.zorko@att.net> for contributing
  	  this.
-	
+
 Fri Nov 30 19:08:19 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/ARGV.cpp (dump): Fixed a bug with dump() so that it
@@ -76,7 +93,7 @@ Wed Nov 28 17:44:26 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 	  ACE_OS::stat().  Thanks to Christopher Kohlhoff
  	  <chris@kohlhoff.com> and Chris Able <cable@scires.com> for
  	  reporting/fixing this.
-  
+
 Sat Dec 01 09:26:27 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.2.1 released.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 456c67d4f49..7c86db45528 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,20 @@
+Sun Dec  2 12:44:58 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* tests/ACE_Init_Test.cpp:
+	* tests/ACE_Init_TestDlg.cpp:
+	  Protect this test against compilation on non-Win32 platforms,
+	  that makes it easier to compile using samwise.
+
+	* tests/RMCast/RMCast_Fragment_Test.cpp:
+	* tests/RMCast/RMCast_Membership_Test.cpp:
+	* tests/RMCast/RMCast_Reassembly_Test.cpp:
+	* tests/RMCast/RMCast_Reordering_Test.cpp:
+	* tests/RMCast/RMCast_Retransmission_Test.cpp:
+	* tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp:
+	  Change #include "test_config.h" to #include "../test_config.h",
+	  it is easier to generate makefiles and projects files with
+	  samwise if we do that.
+
 Sun Dec 02 12:15:25 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* ace/OS.cpp: 
@@ -10,7 +27,7 @@ Sun Dec  2 12:17:09 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* ace/Reactor.i: Fixed a warning in TRU 64. Thanks to
 	  <krumpo@pobox.sk>  which reminded me of the fix in one of my
 	  workspaces. This shows up only in V6.3-013 (cxx) of the
-	  compiler.  
+	  compiler.
 
 Sat Dec  1 19:39:22 2001  Steve Huston  <shuston@riverace.com>
 
@@ -41,7 +58,7 @@ Sat Dec  1 18:03:51 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 	  Added support so that ACE will build and run on Mac OS X 10.1.
   	  Thanks to John Michael Zorko <j.zorko@att.net> for contributing
  	  this.
-	
+
 Fri Nov 30 19:08:19 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/ARGV.cpp (dump): Fixed a bug with dump() so that it
@@ -76,7 +93,7 @@ Wed Nov 28 17:44:26 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 	  ACE_OS::stat().  Thanks to Christopher Kohlhoff
  	  <chris@kohlhoff.com> and Chris Able <cable@scires.com> for
  	  reporting/fixing this.
-  
+
 Sat Dec 01 09:26:27 2001  Balachandran  <bala@cs.wustl.edu>
 
         * ACE version 5.2.1 released.
diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp
index 5284915e7f3..ccb833b6c38 100644
--- a/tests/ACE_Init_Test.cpp
+++ b/tests/ACE_Init_Test.cpp
@@ -14,10 +14,27 @@
 //
 // ACE_Init_Test.cpp : Defines the class behaviors for the application.
 
+#include "test_config.h"
+
+#if !defined(ACE_WIN32)
+
+// If this is not a WIN32 platform do not even try to compile the
+// test, many of the #includes make little sense.
+int
+main (int, char*[])
+{
+  ACE_START_TEST (ACE_TEXT ("ACE_Init_Test"));
+  ACE_ERROR ((LM_INFO,
+              ACE_TEXT ("This is not a Win32 platform, test skipped\n")));
+  ACE_END_TEST;
+  return 0;
+}
+
+#else
+
 #include "ACE_Init_Test_StdAfx.h"
 #include "ACE_Init_Test.h"
 #include "ACE_Init_TestDlg.h"
-#include "test_config.h"
 #include "ace/Thread_Manager.h"
 
 
@@ -69,7 +86,7 @@ BOOL CACE_Init_TestApp::InitInstance()
   CACE_Init_TestDlg dlg;
   m_pMainWnd = &dlg;
   ACE_Thread_Manager::instance()->spawn (wait_and_kill_dialog,
-					 m_pMainWnd);
+                                         m_pMainWnd);
   int nResponse = dlg.DoModal();
   if (nResponse == IDOK)
     {
@@ -108,3 +125,5 @@ wait_and_kill_dialog (void *pBox)
     return 0;
 
 }
+
+#endif /* ACE_WIN32 */
diff --git a/tests/ACE_Init_TestDlg.cpp b/tests/ACE_Init_TestDlg.cpp
index 7251c5dedcc..33530894587 100644
--- a/tests/ACE_Init_TestDlg.cpp
+++ b/tests/ACE_Init_TestDlg.cpp
@@ -2,6 +2,10 @@
 // ACE_Init_TestDlg.cpp : implementation file
 //
 
+#include "ace/config.h"
+
+#if defined(ACE_WIN32)
+
 #include "ACE_Init_Test_StdAfx.h"
 #include "ACE_Init_Test.h"
 #include "ACE_Init_TestDlg.h"
@@ -16,28 +20,28 @@ static char THIS_FILE[] = __FILE__;
 // CACE_Init_TestDlg dialog
 
 CACE_Init_TestDlg::CACE_Init_TestDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(CACE_Init_TestDlg::IDD, pParent)
+        : CDialog(CACE_Init_TestDlg::IDD, pParent)
 {
-	//{{AFX_DATA_INIT(CACE_Init_TestDlg)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-	// Note that LoadIcon does not require a subsequent DestroyIcon in Win32
-	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+        //{{AFX_DATA_INIT(CACE_Init_TestDlg)
+                // NOTE: the ClassWizard will add member initialization here
+        //}}AFX_DATA_INIT
+        // Note that LoadIcon does not require a subsequent DestroyIcon in Win32
+        m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
 }
 
 void CACE_Init_TestDlg::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CACE_Init_TestDlg)
-		// NOTE: the ClassWizard will add DDX and DDV calls here
-	//}}AFX_DATA_MAP
+        CDialog::DoDataExchange(pDX);
+        //{{AFX_DATA_MAP(CACE_Init_TestDlg)
+                // NOTE: the ClassWizard will add DDX and DDV calls here
+        //}}AFX_DATA_MAP
 }
 
 BEGIN_MESSAGE_MAP(CACE_Init_TestDlg, CDialog)
-	//{{AFX_MSG_MAP(CACE_Init_TestDlg)
-	ON_WM_PAINT()
-	ON_WM_QUERYDRAGICON()
-	//}}AFX_MSG_MAP
+        //{{AFX_MSG_MAP(CACE_Init_TestDlg)
+        ON_WM_PAINT()
+        ON_WM_QUERYDRAGICON()
+        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -45,16 +49,16 @@ END_MESSAGE_MAP()
 
 BOOL CACE_Init_TestDlg::OnInitDialog()
 {
-	CDialog::OnInitDialog();
+        CDialog::OnInitDialog();
 
-	// Set the icon for this dialog.  The framework does this automatically
-	//  when the application's main window is not a dialog
-	SetIcon(m_hIcon, TRUE);			// Set big icon
-	SetIcon(m_hIcon, FALSE);		// Set small icon
+        // Set the icon for this dialog.  The framework does this automatically
+        //  when the application's main window is not a dialog
+        SetIcon(m_hIcon, TRUE);                 // Set big icon
+        SetIcon(m_hIcon, FALSE);                // Set small icon
 
-	// TODO: Add extra initialization here
+        // TODO: Add extra initialization here
 
-	return TRUE;  // return TRUE  unless you set the focus to a control
+        return TRUE;  // return TRUE  unless you set the focus to a control
 }
 
 // If you add a minimize button to your dialog, you will need the code below
@@ -63,32 +67,34 @@ BOOL CACE_Init_TestDlg::OnInitDialog()
 
 void CACE_Init_TestDlg::OnPaint()
 {
-	if (IsIconic())
-	{
-		CPaintDC dc(this); // device context for painting
-
-		SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0);
-
-		// Center icon in client rectangle
-		int cxIcon = GetSystemMetrics(SM_CXICON);
-		int cyIcon = GetSystemMetrics(SM_CYICON);
-		CRect rect;
-		GetClientRect(&rect);
-		int x = (rect.Width() - cxIcon + 1) / 2;
-		int y = (rect.Height() - cyIcon + 1) / 2;
-
-		// Draw the icon
-		dc.DrawIcon(x, y, m_hIcon);
-	}
-	else
-	{
-		CDialog::OnPaint();
-	}
+        if (IsIconic())
+        {
+                CPaintDC dc(this); // device context for painting
+
+                SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0);
+
+                // Center icon in client rectangle
+                int cxIcon = GetSystemMetrics(SM_CXICON);
+                int cyIcon = GetSystemMetrics(SM_CYICON);
+                CRect rect;
+                GetClientRect(&rect);
+                int x = (rect.Width() - cxIcon + 1) / 2;
+                int y = (rect.Height() - cyIcon + 1) / 2;
+
+                // Draw the icon
+                dc.DrawIcon(x, y, m_hIcon);
+        }
+        else
+        {
+                CDialog::OnPaint();
+        }
 }
 
 // The system calls this to obtain the cursor to display while the user drags
 //  the minimized window.
 HCURSOR CACE_Init_TestDlg::OnQueryDragIcon()
 {
-	return (HCURSOR) m_hIcon;
+        return (HCURSOR) m_hIcon;
 }
+
+#endif /* ACE_WIN32 */
diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp
index 66179c47ef0..54e1fe687d3 100644
--- a/tests/RMCast/RMCast_Fragment_Test.cpp
+++ b/tests/RMCast/RMCast_Fragment_Test.cpp
@@ -10,7 +10,7 @@
 //
 // ============================================================================
 
-#include "test_config.h"
+#include "../test_config.h"
 #include "ace/Message_Block.h"
 #include "ace/Task.h"
 #include "ace/RMCast/RMCast_Fragment.h"
diff --git a/tests/RMCast/RMCast_Membership_Test.cpp b/tests/RMCast/RMCast_Membership_Test.cpp
index 7550c9efa5e..bf4c7b1999f 100644
--- a/tests/RMCast/RMCast_Membership_Test.cpp
+++ b/tests/RMCast/RMCast_Membership_Test.cpp
@@ -10,7 +10,7 @@
 //
 // ============================================================================
 
-#include "test_config.h"
+#include "../test_config.h"
 #include "ace/RMCast/RMCast_Proxy.h"
 #include "ace/RMCast/RMCast_Membership.h"
 
diff --git a/tests/RMCast/RMCast_Reassembly_Test.cpp b/tests/RMCast/RMCast_Reassembly_Test.cpp
index b9ebfbc3eb3..e0e76e1e3aa 100644
--- a/tests/RMCast/RMCast_Reassembly_Test.cpp
+++ b/tests/RMCast/RMCast_Reassembly_Test.cpp
@@ -10,7 +10,7 @@
 //
 // ============================================================================
 
-#include "test_config.h"
+#include "../test_config.h"
 #include "ace/Task.h"
 #include "ace/RMCast/RMCast_Reassembly.h"
 
diff --git a/tests/RMCast/RMCast_Reordering_Test.cpp b/tests/RMCast/RMCast_Reordering_Test.cpp
index 65f1e79a1d2..7d25a10cf19 100644
--- a/tests/RMCast/RMCast_Reordering_Test.cpp
+++ b/tests/RMCast/RMCast_Reordering_Test.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "test_config.h"
+#include "../test_config.h"
 #include "ace/RMCast/RMCast_Proxy.h"
 #include "ace/RMCast/RMCast_Reordering.h"
 
diff --git a/tests/RMCast/RMCast_Retransmission_Test.cpp b/tests/RMCast/RMCast_Retransmission_Test.cpp
index fbcd7de8f66..a7c2ce3bee4 100644
--- a/tests/RMCast/RMCast_Retransmission_Test.cpp
+++ b/tests/RMCast/RMCast_Retransmission_Test.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "test_config.h"
+#include "../test_config.h"
 #include "ace/RMCast/RMCast_Proxy.h"
 #include "ace/RMCast/RMCast_Retransmission.h"
 
diff --git a/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp b/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp
index 2c8c8e80da7..ae24d308832 100644
--- a/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp
+++ b/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp
@@ -10,7 +10,7 @@
 //
 // ============================================================================
 
-#include "test_config.h"
+#include "../test_config.h"
 #include "ace/RMCast/RMCast_IO_UDP.h"
 #include "ace/RMCast/RMCast_Fragment.h"
 
@@ -131,7 +131,7 @@ main (int, ACE_TCHAR *[])
 
   Receiver receiver (mcast_group);
   if (receiver.open () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in Receiver::open\n")), 1);   
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in Receiver::open\n")), 1);
 
   Sender sender (mcast_group);
   if (sender.activate () != 0)
@@ -153,8 +153,8 @@ main (int, ACE_TCHAR *[])
     }
 
   if (ACE_Thread_Manager::instance ()->wait () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       ACE_TEXT ("Error in Thread_Manager::wait\n")), 
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("Error in Thread_Manager::wait\n")),
                        1);
 
   receiver.dump ();
@@ -183,8 +183,8 @@ int
 Receiver::open (void)
 {
   if (this->io_udp_.subscribe (this->mcast_group_) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       ACE_TEXT ("Error in IO_UDP::subscribe\n")), 
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("Error in IO_UDP::subscribe\n")),
                       -1);
   return 0;
 }