@@ -17,6 +17,7 @@

+  * regress/output-<case>.report file contains more useful info.

diff --git a/changelog b/changelog
index 174733b18669c2e426439cf4b25f9452532d91c5..538275738971fb5a676bd7b55a94bfca409eaf54 100644 (file)
--- a/changelog
+++ b/changelog
@@ -17,6 +17,7 @@ adns (0.9) unstable; urgency=low
   * Do not print warning if sendto() gives EAGAIN.
   * adnsresfilter default timeout changed to 1000ms.
   * m1test script can invoke `hrecord' differently.
   * Do not print warning if sendto() gives EAGAIN.
   * adnsresfilter default timeout changed to 1000ms.
   * m1test script can invoke `hrecord' differently.

+  * regress/output-<case>.report file contains more useful info.

 
  --
 
 
  --
 

diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index e459ee65d30a050969aed7eabb4d2a6ef577d502..bb36528a484a4bda4179ef1be368b8ea40b1a5ea 100644 (file)
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -253,6 +253,7 @@ static int Pbytes(byte *buf, int maxlen) {
   
 void Q_vb(void) {
   int r;
   
 void Q_vb(void) {
   int r;

+  const char *nl;

 
   Tensureinputfile();
   if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();
 
   Tensureinputfile();
   if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();


@@ -272,6 +273,9 @@ void Q_vb(void) {
             vb.used,vb.buf, vb.used,vb2.buf+1);
     exit(1);
   }
             vb.used,vb.buf, vb.used,vb2.buf+1);
     exit(1);
   }

+  Tensurereportfile();
+  nl= memchr(vb.buf,'\n',vb.used);
+  fprintf(Treportfile," %.*s\n", (int)(nl ? nl - (const char*)vb.buf : vb.used), vb.buf);

 }
 
 m4_define(`hm_syscall', `
 }
 
 m4_define(`hm_syscall', `


@@ -300,7 +304,7 @@ int H$1(hm_args_massage($3,void)) {
  fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
 
  Tensurereportfile();
  fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
 
  Tensurereportfile();

- fprintf(Treportfile,"syscallr %s",vb2.buf);
+ fprintf(Treportfile,"%s",vb2.buf);

  amtread= strlen(vb2.buf);
  if (amtread<=0 || vb2.buf[--amtread]!=hm_squote\nhm_squote)
   Psyntax("badly formed line");
  amtread= strlen(vb2.buf);
  if (amtread<=0 || vb2.buf[--amtread]!=hm_squote\nhm_squote)
   Psyntax("badly formed line");