regress: fuzzraw: Improve sync strings

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index 00d7030f6b447e8cbbca2a0b73fd25c00b54dc3d..1b8d019b551c8100404a9eb20f64244b15ceb085 100644 (file)
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -245,7 +245,7 @@ int H$1(hm_args_massage($3,void)) {
  }
 
 #ifdef FUZZRAW_SYNC
-  static const char sync_expect[]= "$1";
+  hm_fr_syscall_ident($'`1)
   static char sync_got[sizeof(sync_expect)];
   Psync(sync_expect, sync_got, sizeof(sync_got), "sync lost: exp=$1");
 #endif

diff --git a/regress/hmacros.i4 b/regress/hmacros.i4
index f9b41434f66c0c0db85548cf1b93e8f77056e8fb..83f5f25edde87b7052d6f094791ca90cc1ccd29d 100644 (file)
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -146,3 +146,7 @@ m4_define(`hm_create_hqcall_args',`
  m4_define(`hm_arg_bytes_out', `$'`4')
  m4_define(`hm_arg_addr_out', `*$'`2')
 ')
+
+m4_define(`hm_fr_syscall_ident',`
+  static const char sync_expect[sizeof("$1")]= "$1\xee";
+')

diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index 96da8dfb37fa77e07af48b03a773002233d8de5f..18cbd0f2dcdbee54a45afdba2b0f9eef99776962 100644 (file)
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -382,7 +382,8 @@ int H$1(hm_args_massage($3,void)) {
  if (memcmp(vb2.buf," $1=",hm_r_offset)) Psyntax("syscall reply mismatch");
 
 #ifdef FUZZRAW_SYNC
- FR_WRITE("$1");
+ hm_fr_syscall_ident($1)
+ FR_WRITE(sync_expect);
 #endif
 
  m4_define(`hm_rv_check_errno',`