tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / adjtimex.c

diff --git a/tests/adjtimex.c b/tests/adjtimex.c
index 316cefbb5f5911e6f48636787eb3ee871eb6d73b..4d68ea11616ad12777c91e88e64e52c0645bcae0 100644 (file)
--- a/tests/adjtimex.c
+++ b/tests/adjtimex.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * This file is part of adjtimex strace test.
+ *
+ * Copyright (c) 2015-2017 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,49 +30,65 @@
 #include "tests.h"
 #include <stdio.h>
 #include <stdint.h>
+#include <string.h>
 #include <sys/timex.h>
 
+#include "xlat.h"
+#include "xlat/adjtimex_state.h"
+#include "xlat/adjtimex_status.h"
+
 int
 main(void)
 {
-       struct timex tx = {};
-       int state = adjtimex(&tx);
+       int state = adjtimex(NULL);
+       printf("adjtimex(NULL) = %s\n", sprintrc(state));
+
+       TAIL_ALLOC_OBJECT_CONST_PTR(struct timex, tx);
+       memset(tx, 0, sizeof(*tx));
 
+       state = adjtimex(tx);
        if (state < 0)
-               return 77;
+               perror_msg_and_skip("adjtimex");
 
-       printf("adjtimex\\(\\{modes=0, offset=%jd, freq=%jd, maxerror=%jd"
-              ", esterror=%jd, status=%s, constant=%jd, precision=%jd"
-              ", tolerance=%jd, time={%jd, %jd}, tick=%jd, ppsfreq=%jd"
-              ", jitter=%jd, shift=%d, stabil=%jd, jitcnt=%jd, calcnt=%jd"
-              ", errcnt=%jd, stbcnt=%jd"
+       printf("adjtimex({modes=0, offset=%jd, freq=%jd, maxerror=%jd"
+              ", esterror=%jd, status=",
+              (intmax_t) tx->offset,
+              (intmax_t) tx->freq,
+              (intmax_t) tx->maxerror,
+              (intmax_t) tx->esterror);
+       if (tx->status)
+               printflags(adjtimex_status, (unsigned int) tx->status, NULL);
+       else
+               putchar('0');
+       printf(", constant=%jd, precision=%jd"
+              ", tolerance=%jd, time={tv_sec=%lld, tv_usec=%llu}, tick=%jd"
+              ", ppsfreq=%jd, jitter=%jd, shift=%d, stabil=%jd, jitcnt=%jd"
+              ", calcnt=%jd, errcnt=%jd, stbcnt=%jd"
 #ifdef HAVE_STRUCT_TIMEX_TAI
               ", tai=%d"
 #endif
-              "\\}\\) = %d \\(TIME_[A-Z]+\\)\n",
-              (intmax_t) tx.offset,
-              (intmax_t) tx.freq,
-              (intmax_t) tx.maxerror,
-              (intmax_t) tx.esterror,
-              tx.status ? "STA_[A-Z]+(\\|STA_[A-Z]+)*" : "0",
-              (intmax_t) tx.constant,
-              (intmax_t) tx.precision,
-              (intmax_t) tx.tolerance,
-              (intmax_t) tx.time.tv_sec,
-              (intmax_t) tx.time.tv_usec,
-              (intmax_t) tx.tick,
-              (intmax_t) tx.ppsfreq,
-              (intmax_t) tx.jitter,
-              tx.shift,
-              (intmax_t) tx.stabil,
-              (intmax_t) tx.jitcnt,
-              (intmax_t) tx.calcnt,
-              (intmax_t) tx.errcnt,
-              (intmax_t) tx.stbcnt,
+              "}) = %d (",
+              (intmax_t) tx->constant,
+              (intmax_t) tx->precision,
+              (intmax_t) tx->tolerance,
+              (long long) tx->time.tv_sec,
+              zero_extend_signed_to_ull(tx->time.tv_usec),
+              (intmax_t) tx->tick,
+              (intmax_t) tx->ppsfreq,
+              (intmax_t) tx->jitter,
+              tx->shift,
+              (intmax_t) tx->stabil,
+              (intmax_t) tx->jitcnt,
+              (intmax_t) tx->calcnt,
+              (intmax_t) tx->errcnt,
+              (intmax_t) tx->stbcnt,
 #ifdef HAVE_STRUCT_TIMEX_TAI
-              tx.tai,
+              tx->tai,
 #endif
               state);
+       printxval(adjtimex_state, (unsigned int) state, NULL);
+       puts(")");
 
+       puts("+++ exited with 0 +++");
        return 0;
 }