chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in changelog entry for 1.6.1
[adns.git]
/
regress
/
hrecord.c.m4
diff --git
a/regress/hrecord.c.m4
b/regress/hrecord.c.m4
index 17f70344c72b4ad21abac83fd144fd03430fbae8..94e661760a1e57a369b2dad89d2031e71ec1e6f8 100644
(file)
--- a/
regress/hrecord.c.m4
+++ b/
regress/hrecord.c.m4
@@
-2,16
+2,12
@@
m4_dnl hrecord.c.m4
m4_dnl (part of complex test harness, not of the library)
m4_dnl - recording routines
m4_dnl (part of complex test harness, not of the library)
m4_dnl - recording routines
-m4_dnl This file is
-m4_dnl Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
-m4_dnl
-m4_dnl It is part of adns, which is
-m4_dnl Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
-m4_dnl Copyright (C) 1999 Tony Finch <dot@dotat.at>
+m4_dnl This file is part of adns, which is Copyright Ian Jackson
+m4_dnl and contributors (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
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,
m4_dnl any later version.
m4_dnl
m4_dnl This program is distributed in the hope that it will be useful,
@@
-20,17
+16,19
@@
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 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_include(hmacros.i4)
#include <assert.h>
#include <string.h>
m4_include(hmacros.i4)
#include <assert.h>
#include <string.h>
-#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>
#include <errno.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+
#include "harness.h"
static FILE *Toutputfile;
#include "harness.h"
static FILE *Toutputfile;
@@
-42,7
+40,7
@@
static void R_recordtime(void) {
int r;
struct timeval tv, tvrel;
int r;
struct timeval tv, tvrel;
- Tensure
outputfile
();
+ Tensure
setup
();
r= gettimeofday(&tv,0); if (r) Tfailed("gettimeofday syscallbegin");
tvrel.tv_sec= tv.tv_sec - currenttime.tv_sec;
tvrel.tv_usec= tv.tv_usec - currenttime.tv_usec;
r= gettimeofday(&tv,0); if (r) Tfailed("gettimeofday syscallbegin");
tvrel.tv_sec= tv.tv_sec - currenttime.tv_sec;
tvrel.tv_usec= tv.tv_usec - currenttime.tv_usec;
@@
-51,7
+49,9
@@
static void R_recordtime(void) {
currenttime= tv;
}
currenttime= tv;
}
-void Tensureoutputfile(void) {
+void T_gettimeofday_hook(void) { }
+
+void Tensuresetup(void) {
const char *fdstr;
int fd, r;
const char *fdstr;
int fd, r;
@@
-71,7
+71,7
@@
void Tensureoutputfile(void) {
void Q_vb(void) {
if (!adns__vbuf_append(&vb,"",1)) Tnomem();
void Q_vb(void) {
if (!adns__vbuf_append(&vb,"",1)) Tnomem();
- Tensure
outputfile
();
+ Tensure
setup
();
if (fprintf(Toutputfile," %s\n",vb.buf) == EOF) Toutputerr();
if (fflush(Toutputfile)) Toutputerr();
}
if (fprintf(Toutputfile," %s\n",vb.buf) == EOF) Toutputerr();
if (fflush(Toutputfile)) Toutputerr();
}
@@
-110,7
+110,7
@@
int H$1(hm_args_massage($3,void)) {
m4_define(`hm_rv_must',`Tmust("$1","return",!r); Tvba("OK");')
m4_define(`hm_rv_len',`
if (r==-1) { Tvberrno(e); goto x_error; }
m4_define(`hm_rv_must',`Tmust("$1","return",!r); Tvba("OK");')
m4_define(`hm_rv_len',`
if (r==-1) { Tvberrno(e); goto x_error; }
- Tmust("$1","return",r<=$'`1);
+ Tmust("$
'`
1","return",r<=$'`1);
Tvba("OK");')
m4_define(`hm_rv_fcntl',`
if (r==-1) { Tvberrno(e); goto x_error; }
Tvba("OK");')
m4_define(`hm_rv_fcntl',`
if (r==-1) { Tvberrno(e); goto x_error; }
@@
-136,6
+136,7
@@
int H$1(hm_args_massage($3,void)) {
m4_define(`hm_arg_bytes_out',`Tvbbytes($'`2,r);')
$3
m4_define(`hm_arg_bytes_out',`Tvbbytes($'`2,r);')
$3
+ hm_create_nothing
m4_define(`hm_rv_any',`x_error:')
m4_define(`hm_rv_fd',`x_error:')
m4_define(`hm_rv_succfail',`x_error:')
m4_define(`hm_rv_any',`x_error:')
m4_define(`hm_rv_fd',`x_error:')
m4_define(`hm_rv_succfail',`x_error:')
@@
-151,4
+152,8
@@
int H$1(hm_args_massage($3,void)) {
}
')
}
')
+m4_define(`hm_specsyscall', `')
+
m4_include(`hsyscalls.i4')
m4_include(`hsyscalls.i4')
+
+hm_stdsyscall_close