[Pvfs2-cvs] commit by vilayann in pvfs2-1/test/io/flow: test-bmi-cache-server.c test-harness-server-trove.c test1-server.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/test/io/flow
In directory parlweb1:/tmp/cvs-serv7687/test/io/flow

Modified Files:
      Tag: posix-extensions-branch
	test-bmi-cache-server.c test-harness-server-trove.c 
	test1-server.c 
Log Message:
Reverse merge changes from HEAD to posix-extensions-branch.



Index: test-bmi-cache-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/test/io/flow/test-bmi-cache-server.c,v
diff -p -u -r1.5 -r1.5.28.1
--- test-bmi-cache-server.c	28 Jul 2004 14:33:05 -0000	1.5
+++ test-bmi-cache-server.c	9 Aug 2006 20:18:09 -0000	1.5.28.1
@@ -22,8 +22,7 @@
 #include "pvfs2-request.h"
 
 #include "trove.h"
-
-#define ROOT_HANDLE_STRING "root_handle"
+#include "pvfs2-internal.h"
 
 static int block_on_flow(
     flow_descriptor * flow_d);
@@ -363,7 +362,7 @@ int path_lookup(
     TROVE_op_id op_id;
     TROVE_handle handle;
 
-    char root_handle_string[] = ROOT_HANDLE_STRING;
+    char root_handle_string[] = ROOT_HANDLE_KEYSTR;
 
     /* get root */
     key.buffer = root_handle_string;

Index: test-harness-server-trove.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/test/io/flow/test-harness-server-trove.c,v
diff -p -u -r1.30 -r1.30.16.1
--- test-harness-server-trove.c	7 Jul 2005 15:35:55 -0000	1.30
+++ test-harness-server-trove.c	9 Aug 2006 20:18:09 -0000	1.30.16.1
@@ -23,8 +23,7 @@
 #include "pvfs2-request.h"
 
 #include "trove.h"
-
-#define ROOT_HANDLE_STRING "root_handle"
+#include "pvfs2-internal.h"
 
 static int block_on_flow(
     flow_descriptor * flow_d);
@@ -369,7 +368,7 @@ int path_lookup(
     TROVE_op_id op_id;
     TROVE_handle handle;
 
-    char root_handle_string[] = ROOT_HANDLE_STRING;
+    char root_handle_string[] = ROOT_HANDLE_KEYSTR;
 
     /* get root */
     key.buffer = root_handle_string;

Index: test1-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/test/io/flow/test1-server.c,v
diff -p -u -r1.7 -r1.7.16.1
--- test1-server.c	7 Jul 2005 15:35:55 -0000	1.7
+++ test1-server.c	9 Aug 2006 20:18:09 -0000	1.7.16.1
@@ -24,8 +24,7 @@
 #include "pvfs2-request.h"
 
 #include "trove.h"
-
-#define ROOT_HANDLE_STRING "root_handle"
+#include "pvfs2-internal.h"
 
 static int block_on_flow(
     flow_descriptor * flow_d);
@@ -366,7 +365,7 @@ int path_lookup(
     TROVE_op_id op_id;
     TROVE_handle handle;
 
-    char root_handle_string[] = ROOT_HANDLE_STRING;
+    char root_handle_string[] = ROOT_HANDLE_KEYSTR;
 
     /* get root */
     key.buffer = root_handle_string;