ChangeLogTag: Fri Jul 20 17:37:27 UTC 2012 Adam Mitz <mitza@ociweb.com>

6 files changed, 37 insertions, 7 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 7753bc58934..4c293d32790 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,19 @@
+Fri Jul 20 17:37:27 UTC 2012  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/config-vxworks6.8.h:
+        * ace/config-vxworks6.9.h:
+
+          Changes to build for VxWorks 6.8 kernel mode.
+
+        * bin/PerlACE/ProcessVX_Win32.pm:
+        * tests/run_test.lst:
+
+          Changes for VxWorks testing.
+
+        * bin/PerlACE/TestTarget.pm
+
+          Fixed a Perl bug (ne vs. !=).
+
 Tue Jun 26 21:47:18 UTC 2012  Adam Mitz  <mitza@ociweb.com>
 
         * bin/valgrind.supp:
diff --git a/ACE/ace/config-vxworks6.8.h b/ACE/ace/config-vxworks6.8.h
index e092e8ca241..f8ba3f9afa7 100644
--- a/ACE/ace/config-vxworks6.8.h
+++ b/ACE/ace/config-vxworks6.8.h
@@ -16,6 +16,10 @@
 
 #include "ace/config-vxworks6.7.h"
 
+#ifndef ACE_LACKS_RAND_R
+# define ACE_LACKS_RAND_R 1
+#endif
+
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_VXWORKS_6_8_H */
 
diff --git a/ACE/ace/config-vxworks6.9.h b/ACE/ace/config-vxworks6.9.h
index 071b4a53636..8bbbfb6b07a 100644
--- a/ACE/ace/config-vxworks6.9.h
+++ b/ACE/ace/config-vxworks6.9.h
@@ -21,10 +21,6 @@
 # define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1
 #endif
 
-#ifndef ACE_LACKS_RAND_R
-# define ACE_LACKS_RAND_R 1
-#endif
-
 #if defined(__RTP__)
 // bzero is in strings.h
 # define ACE_HAS_STRINGS 1
diff --git a/ACE/bin/PerlACE/ProcessVX_Win32.pm b/ACE/bin/PerlACE/ProcessVX_Win32.pm
index e50b9b2c6c9..3d9c6c8c168 100644
--- a/ACE/bin/PerlACE/ProcessVX_Win32.pm
+++ b/ACE/bin/PerlACE/ProcessVX_Win32.pm
@@ -284,7 +284,21 @@ if (!defined $t) {
 if (!$t->open()) {
     die "ERROR: Telnet open to <" . $telnet_host . ":". $telnet_port . "> " . $t->errmsg;
 }
+__END__
+
+   if (defined $ENV{'ACE_RUN_VX_TERMSERV_DEV'}) {
+     print $oh <<'__END__';
+
+$t->prompt('/' . $ENV{'ACE_RUN_VX_IBOOT_USER'} . '>$/');
+$t->login($ENV{'ACE_RUN_VX_IBOOT_USER'}, $ENV{'ACE_RUN_VX_IBOOT_PASSWORD'});
+$t->print('direct ' . $ENV{'ACE_RUN_VX_TERMSERV_DEV'});
+$t->waitfor('/Entering Direct mode/');
+$t->print('');
 
+__END__
+   }
+
+    print $oh <<'__END__';
 my $target_login = $ENV{'ACE_RUN_VX_LOGIN'};
 my $target_password = $ENV{'ACE_RUN_VX_PASSWORD'};
 
diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm
index 58e8b53f574..7004bea1770 100644
--- a/ACE/bin/PerlACE/TestTarget.pm
+++ b/ACE/bin/PerlACE/TestTarget.pm
@@ -408,7 +408,7 @@ sub PutFile ($)
     my $self = shift;
     my $src = shift;
     my $dest = $self->LocalFile ($src);
-    if ($src != $dest) {
+    if ($src ne $dest) {
         copy ($src, $dest);
     }
     return 0;
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index f8218cac1c5..6201e3c5ca4 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -38,7 +38,7 @@ Bug_2497_Regression_Test
 Bug_2540_Regression_Test
 Bug_2609_Regression_Test: !ST !ACE_FOR_TAO
 Bug_2610_Regression_Test: !ST !ACE_FOR_TAO !FIXED_BUGS_ONLY
-Bug_2659_Regression_Test: !ST !VxWorks64 !VxWorks65
+Bug_2659_Regression_Test: !ST !VxWorks
 Bug_2653_Regression_Test: !ST
 Bug_2740_Regression_Test: !ST
 Bug_2772_Regression_Test: !ST !FIXED_BUGS_ONLY
@@ -188,7 +188,7 @@ Refcounted_Event_Handler_Test_DevPoll:
 Reverse_Lock_Test
 RW_Process_Mutex_Test: !VxWorks !ACE_FOR_TAO !PHARLAP !Cygwin
 Sendfile_Test: !QNX !NO_NETWORK !VxWorks !LabVIEW_RT
-Signal_Test: !VxWorks63 !VxWorks64 !VxWorks65 !Cygwin
+Signal_Test: !VxWorks !Cygwin
 SOCK_Connector_Test: !NO_NETWORK
 SOCK_Netlink_Test: !ACE_FOR_TAO
 SOCK_Send_Recv_Test: !NO_NETWORK