summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ASNMP/tests/test_config.h55
-rw-r--r--examples/Naming/test_multiple_contexts.cpp6
-rw-r--r--examples/Naming/test_non_existent.cpp4
-rw-r--r--examples/Naming/test_writers.cpp4
-rw-r--r--performance-tests/Misc/test_naming.cpp6
-rw-r--r--tests/Naming_Test.cpp11
-rw-r--r--tests/SString_Test.cpp2
7 files changed, 15 insertions, 73 deletions
diff --git a/ASNMP/tests/test_config.h b/ASNMP/tests/test_config.h
index dc9155b8605..4f18d05d7cd 100644
--- a/ASNMP/tests/test_config.h
+++ b/ASNMP/tests/test_config.h
@@ -46,49 +46,20 @@ typedef size_t KEY;
#if defined (ACE_WIN32)
-#define ACE_DEFAULT_TEST_FILE_A "C:\\temp\\ace_test_file"
-#define ACE_TEMP_FILE_NAME_A "C:\\temp\\ace_temp_file"
-#define ACE_LOG_DIRECTORY_A "C:\\temp\\log\\"
-#define MAKE_PIPE_NAME_A(X) "\\\\.\\pipe\\"#X
-
-#define ACE_DEFAULT_TEST_FILE_W L"C:\\temp\\ace_test_file"
-#define ACE_TEMP_FILE_NAME_W L"C:\\temp\\ace_temp_file"
-#define ACE_LOG_DIRECTORY_W L"C:\\temp\\log\\"
-#define MAKE_PIPE_NAME_W(X) L"\\\\.\\pipe\\"#X
+#define ACE_DEFAULT_TEST_FILE ACE_TEXT ("C:\\temp\\ace_test_file")
+#define ACE_TEMP_FILE_NAME ACE_TEXT ("C:\\temp\\ace_temp_file")
+#define ACE_LOG_DIRECTORY ACE_TEXT ("C:\\temp\\log\\")
+#define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\"#X)
#else
-#define ACE_DEFAULT_TEST_FILE_A "/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_A "/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_A "log/"
-#define MAKE_PIPE_NAME_A(X) X
-
-#if defined (ACE_HAS_UNICODE)
-#define ACE_DEFAULT_TEST_FILE_W L"/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_W L"/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_W L"log/"
-#define MAKE_PIPE_NAME_W(X) L##X
-#else
-#define ACE_DEFAULT_TEST_FILE_W "/tmp/ace_test_file"
-#define ACE_TEMP_FILE_NAME_W "/tmp/ace_temp_file"
-#define ACE_LOG_DIRECTORY_W "log/"
-#define MAKE_PIPE_NAME_W(X) X
-#endif /* ACE_HAS_UNICODE */
+#define ACE_DEFAULT_TEST_FILE ACE_TEXT ("/tmp/ace_test_file")
+#define ACE_TEMP_FILE_NAME ACE_TEXT ("/tmp/ace_temp_file")
+#define ACE_LOG_DIRECTORY ACE_TEXT ("log/")
+#define MAKE_PIPE_NAME(X) ACE_TEXT (X)
#endif /* ACE_WIN32 */
-#if defined (UNICODE)
-#define ACE_DEFAULT_TEST_FILE ACE_DEFAULT_TEST_FILE_W
-#define ACE_TEMP_FILE_NAME ACE_TEMP_FILE_NAME_W
-#define ACE_LOG_DIRECTORY ACE_LOG_DIRECTORY_W
-#define MAKE_PIPE_NAME MAKE_PIPE_NAME_W
-#else
-#define ACE_DEFAULT_TEST_FILE ACE_DEFAULT_TEST_FILE_A
-#define ACE_TEMP_FILE_NAME ACE_TEMP_FILE_NAME_A
-#define ACE_LOG_DIRECTORY ACE_LOG_DIRECTORY_A
-#define MAKE_PIPE_NAME MAKE_PIPE_NAME_A
-#endif /* UNICODE */
-
#define ACE_START_TEST(NAME) \
const char *program = NAME; \
ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
@@ -121,8 +92,8 @@ do {\
#define ACE_INIT_LOG(NAME) \
char temp[BUFSIZ]; \
ACE_OS::sprintf (temp, "%s%s%s", \
- ACE_LOG_DIRECTORY_A, \
- ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR_A), \
+ ACE_LOG_DIRECTORY, \
+ ACE::basename (NAME, ACE_DIRECTORY_SEPARATOR_CHAR), \
".log"); \
ACE_DEBUG ((LM_DEBUG, "Deleting old log file %s (if any)\n\n", temp)); \
ACE_OS::unlink (temp);
@@ -166,10 +137,10 @@ ACE_Test_Output::set_output (const char *filename, int append)
{
char temp[BUFSIZ];
// Ignore the error value since the directory may already exist.
- ACE_OS::mkdir (ACE_LOG_DIRECTORY_A);
+ ACE_OS::mkdir (ACE_LOG_DIRECTORY);
ACE_OS::sprintf (temp, "%s%s%s",
- ACE_LOG_DIRECTORY_A,
- ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR_A),
+ ACE_LOG_DIRECTORY,
+ ACE::basename (filename, ACE_DIRECTORY_SEPARATOR_CHAR),
".log");
int flags = ios::out;
diff --git a/examples/Naming/test_multiple_contexts.cpp b/examples/Naming/test_multiple_contexts.cpp
index 584d98d5da9..307260c250b 100644
--- a/examples/Naming/test_multiple_contexts.cpp
+++ b/examples/Naming/test_multiple_contexts.cpp
@@ -6,8 +6,6 @@ ACE_RCSID(Naming, test_multiple_contexts, "$Id$")
int main (int, char *[])
{
-#if defined (ACE_HAS_WCHAR)
-
static u_long ACE_DEFAULT_BASE_ADDR_1 = (1 * 64 * 1024 * 1024);
static u_long ACE_DEFAULT_BASE_ADDR_2 = (2 * 64 * 1024 * 1024);
@@ -79,9 +77,5 @@ int main (int, char *[])
if (i != 0)
return -1;
-#else /* ACE_HAS_WCHAR */
- ACE_ERROR ((LM_INFO, ACE_TEXT ("Naming requires wchar_t support to run.\n")));
-#endif /* ACE_HAS_WCHAR */
-
return 0;
}
diff --git a/examples/Naming/test_non_existent.cpp b/examples/Naming/test_non_existent.cpp
index 79ec5670345..f8785ad0f81 100644
--- a/examples/Naming/test_non_existent.cpp
+++ b/examples/Naming/test_non_existent.cpp
@@ -6,7 +6,6 @@ ACE_RCSID(Naming, test_non_existent, "$Id$")
int main (int, char *[])
{
-#if defined (ACE_HAS_WCHAR)
int i;
ACE_Naming_Context *ns_ptr;
@@ -48,8 +47,5 @@ int main (int, char *[])
ACE_DEBUG ((LM_DEBUG,
"(%P) bound with %d\n",
i));
-#else /* ACE_HAS_WCHAR */
- ACE_ERROR ((LM_INFO, ACE_TEXT ("Naming requires wchar_t support to run.\n")));
-#endif /* ACE_HAS_WCHAR */
return 0;
}
diff --git a/examples/Naming/test_writers.cpp b/examples/Naming/test_writers.cpp
index f2677233f97..aa7a3c988a5 100644
--- a/examples/Naming/test_writers.cpp
+++ b/examples/Naming/test_writers.cpp
@@ -6,7 +6,6 @@ ACE_RCSID(Naming, test_writers, "$Id$")
int main (int, char *[])
{
-#if defined (ACE_HAS_WCHAR)
int i;
ACE_Naming_Context *ns_ptr;
@@ -67,8 +66,5 @@ int main (int, char *[])
}
}
-#else /* ACE_HAS_WCHAR */
- ACE_ERROR ((LM_INFO, ACE_TEXT ("Naming requires wchar_t support to run.\n")));
-#endif /* ACE_HAS_WCHAR */
return 0;
}
diff --git a/performance-tests/Misc/test_naming.cpp b/performance-tests/Misc/test_naming.cpp
index a7f3225a552..acdfacfb119 100644
--- a/performance-tests/Misc/test_naming.cpp
+++ b/performance-tests/Misc/test_naming.cpp
@@ -23,7 +23,6 @@
ACE_RCSID(Misc, test_naming, "$Id$")
-#if defined (ACE_HAS_WCHAR)
#define ACE_NS_MAX_ENTRIES 4000
@@ -166,12 +165,10 @@ void do_testing (int argc, char *argv[], int light)
et.real_time, et.user_time, et.system_time));
}
-#endif /* ACE_HAS_WCHAR */
int
main (int argc, char *argv[])
{
-#if defined (ACE_HAS_WCHAR)
// Do testing with SYNC on
ACE_DEBUG ((LM_DEBUG, "SYNC is ON\n"));
do_testing (argc, argv, 0);
@@ -179,8 +176,5 @@ main (int argc, char *argv[])
// Do testing with SYNC off
ACE_DEBUG ((LM_DEBUG, "SYNC is OFF\n"));
do_testing (argc, argv, 1);
-#else /* ACE_HAS_WCHAR */
- ACE_ERROR ((LM_INFO, "Naming isn't supported without wchar_t\n"));
-#endif /* ACE_HAS_WCHAR */
return 0;
}
diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp
index 8b0a9a752ba..8998fab053f 100644
--- a/tests/Naming_Test.cpp
+++ b/tests/Naming_Test.cpp
@@ -25,8 +25,6 @@
ACE_RCSID(tests, Naming_Test, "$Id$")
-#if defined (ACE_HAS_WCHAR)
-
static char name[BUFSIZ];
static char value[BUFSIZ];
static char type[BUFSIZ];
@@ -174,13 +172,11 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result)
}
}
-#endif /* ACE_HAS_WCHAR */
int
main (int argc, ACE_TCHAR *argv[])
{
ACE_START_TEST (ACE_TEXT ("Naming_Test"));
-#if defined (ACE_HAS_WCHAR)
ACE_TCHAR temp_file [BUFSIZ];
ACE_Naming_Context *ns_context;
ACE_NEW_RETURN (ns_context, ACE_Naming_Context, -1);
@@ -190,9 +186,9 @@ main (int argc, ACE_TCHAR *argv[])
name_options->parse_args (argc, argv);
int unicode = 0;
-#if (defined (ACE_WIN32) && defined (UNICODE))
+#if (defined (ACE_WIN32) && defined (ACE_USES_WCHAR))
unicode = 1;
-#endif /* ACE_WIN32 && UNICODE */
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
if (unicode && name_options->use_registry () == 1)
{
name_options->namespace_dir (ACE_TEXT ("Software\\ACE\\Name Service"));
@@ -257,9 +253,6 @@ main (int argc, ACE_TCHAR *argv[])
// since we don't care if the file doesn't exist.
ACE_OS::unlink (temp_file);
-#else /* ACE_HAS_TCHAR */
- ACE_ERROR ((LM_INFO, ACE_TEXT ("Naming_Test requires wchar_t support to run.\n")));
-#endif /* ACE_HAS_TCHAR */
ACE_END_TEST;
return 0;
}
diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp
index aec8364fa7e..2e19f4fc768 100644
--- a/tests/SString_Test.cpp
+++ b/tests/SString_Test.cpp
@@ -122,7 +122,6 @@ main (int, ACE_TCHAR *[])
ACE_ASSERT (s1.rfind ('l', 3) == 2);
}
-#if defined (ACE_HAS_WCHAR)
{
ACE_WString s0 ("hello");
ACE_WString s1 ("hello");
@@ -169,7 +168,6 @@ main (int, ACE_TCHAR *[])
ACE_ASSERT (s1.rfind ('l') == 3);
ACE_ASSERT (s1.rfind ('l', 3) == 2);
}
-#endif /* ACE_HAS_WCHAR */
ACE_END_TEST;
return 0;
View Lorry Controller Status