X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fhmacros.i4;h=83f5f25edde87b7052d6f094791ca90cc1ccd29d;hb=814cee186999a6e9a76ab970f891347c1e42b132;hp=ff8620ec214eed253812a37b717b4ac7e110242b;hpb=5c6cd9e070869430d1833751512d47300599f54c;p=adns.git

diff --git a/regress/hmacros.i4 b/regress/hmacros.i4
index ff8620e..83f5f25 100644
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -3,14 +3,15 @@ m4_dnl (part of complex test harness, not of the library)
 m4_dnl - common macros
 
 m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
+m4_dnl    Copyright (C) 2014  Mark Wooding
 m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
 m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
 m4_dnl  (See the file INSTALL for full details.)
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
-m4_dnl  the Free Software Foundation; either version 2, or (at your option)
+m4_dnl  the Free Software Foundation; either version 3, or (at your option)
 m4_dnl  any later version.
 m4_dnl  
 m4_dnl  This program is distributed in the hope that it will be useful,
@@ -19,8 +20,7 @@ m4_dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 m4_dnl  GNU General Public License for more details.
 m4_dnl  
 m4_dnl  You should have received a copy of the GNU General Public License
-m4_dnl  along with this program; if not, write to the Free Software Foundation,
-m4_dnl  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+m4_dnl  along with this program; if not, write to the Free Software Foundation.
 
 m4_define(`hm_args_massage',
 	`m4_ifelse(
@@ -54,6 +54,14 @@ m4_define(`hm_create_nothing', `
  m4_define(`hm_arg_bytes_in', `')
  m4_define(`hm_arg_bytes_out', `')
  m4_define(`hm_arg_addr_out', `')
+ m4_define(`hm_rv_must', `')
+ m4_define(`hm_rv_any', `')
+ m4_define(`hm_rv_fd', `')
+ m4_define(`hm_rv_succfail', `')
+ m4_define(`hm_rv_len', `')
+ m4_define(`hm_rv_fcntl', `')
+ m4_define(`hm_rv_select', `hm_rv_any')
+ m4_define(`hm_rv_poll', `hm_rv_any')
 ')
 
 m4_define(`hm_create_proto_h',`
@@ -99,11 +107,11 @@ m4_define(`hm_create_hqcall_init',`
  m4_define(`hm_arg_socktype',`
   Tmust("$1","$'`1",$'`1==SOCK_STREAM || $'`1==SOCK_DGRAM);')
  m4_define(`hm_arg_addrfam',`
-  Tmust("$1","$'`1",$'`1==PF_INET || $'`1==PF_INET6);')
+  Tmust("$1","$'`1",$'`1==AF_INET || $'`1==AF_INET6);')
  m4_define(`hm_arg_fcntl_cmd_arg',`
   Tmust("$1","$'`1",$'`1==F_SETFL || $'`1==F_GETFL);
   if ($'`1 == F_SETFL) {
-    va_start(al,$'`1); $'`2= va_arg(al,long); va_end(al);
+    va_start(al,$'`1); $'`2= va_arg(al,int); va_end(al);
   } else {
     $'`2= 0;
   }')
@@ -138,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";
+')