Makefile.am: Clean flake8-check too.

[cascardo/ovs.git] / tests / test-util.c

diff --git a/tests/test-util.c b/tests/test-util.c
index 74bc5c4..8eedaf0 100644 (file)
--- a/tests/test-util.c
+++ b/tests/test-util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 #include "command-line.h"
 #include "ovstest.h"
 #include "random.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 static void
 check_log_2_floor(uint32_t x, int n)
@@ -40,7 +40,7 @@ check_log_2_floor(uint32_t x, int n)
 }
 
 static void
-test_log_2_floor(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_log_2_floor(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     int n;
 
@@ -79,7 +79,7 @@ check_ctz64(uint64_t x, int n)
 }
 
 static void
-test_ctz(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_ctz(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     int n;
 
@@ -132,7 +132,7 @@ check_clz64(uint64_t x, int n)
 }
 
 static void
-test_clz(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_clz(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     int n;
 
@@ -182,7 +182,7 @@ check_rup2(uint32_t x, int n)
 }
 
 static void
-test_round_up_pow2(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_round_up_pow2(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     int n;
 
@@ -210,7 +210,7 @@ check_rdp2(uint32_t x, int n)
 }
 
 static void
-test_round_down_pow2(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_round_down_pow2(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     int n;
 
@@ -248,7 +248,7 @@ check_count_1bits(uint64_t x, int n)
 }
 
 static void
-test_count_1bits(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_count_1bits(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     uint64_t bits[64];
     int i;
@@ -287,7 +287,7 @@ sum_of_squares(int n)
 }
 
 static void
-test_bitwise_copy(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_bitwise_copy(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     unsigned int n_loops;
     int src_ofs;
@@ -337,7 +337,7 @@ test_bitwise_copy(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 }
 
 static void
-test_bitwise_zero(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_bitwise_zero(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     unsigned int n_loops;
     int dst_ofs;
@@ -378,7 +378,7 @@ test_bitwise_zero(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 }
 
 static void
-test_bitwise_one(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_bitwise_one(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     unsigned int n_loops;
     int dst_ofs;
@@ -419,7 +419,7 @@ test_bitwise_one(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 }
 
 static void
-test_bitwise_is_all_zeros(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_bitwise_is_all_zeros(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     int n_loops;
 
@@ -463,25 +463,25 @@ test_bitwise_is_all_zeros(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 }
 
 static void
-test_follow_symlinks(int argc, char *argv[])
+test_follow_symlinks(struct ovs_cmdl_context *ctx)
 {
     int i;
 
-    for (i = 1; i < argc; i++) {
-        char *target = follow_symlinks(argv[i]);
+    for (i = 1; i < ctx->argc; i++) {
+        char *target = follow_symlinks(ctx->argv[i]);
         puts(target);
         free(target);
     }
 }
 
 static void
-test_assert(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_assert(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     ovs_assert(false);
 }
 
 static void
-test_ovs_scan(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_ovs_scan(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     char str[16], str2[16], str3[16];
     long double ld, ld2;
@@ -497,7 +497,6 @@ test_ovs_scan(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
     long l, l2;
     int i, i2;
 
-    ovs_assert(ovs_scan("", ""));
     ovs_assert(ovs_scan("", " "));
     ovs_assert(ovs_scan(" ", " "));
     ovs_assert(ovs_scan("  ", " "));
@@ -1013,7 +1012,7 @@ test_ovs_scan(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 }
 
 static void
-test_snprintf(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_snprintf(struct ovs_cmdl_context *ctx OVS_UNUSED)
 {
     char s[16];
 
@@ -1031,25 +1030,25 @@ test_snprintf(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 
 #ifndef _WIN32
 static void
-test_file_name(int argc, char *argv[])
+test_file_name(struct ovs_cmdl_context *ctx)
 {
     int i;
 
-    for (i = 1; i < argc; i++) {
+    for (i = 1; i < ctx->argc; i++) {
         char *dir, *base;
 
-        dir = dir_name(argv[i]);
+        dir = dir_name(ctx->argv[i]);
         puts(dir);
         free(dir);
 
-        base = base_name(argv[i]);
+        base = base_name(ctx->argv[i]);
         puts(base);
         free(base);
     }
 }
 #endif /* _WIN32 */
 \f
-static const struct command commands[] = {
+static const struct ovs_cmdl_command commands[] = {
     {"ctz", NULL, 0, 0, test_ctz},
     {"clz", NULL, 0, 0, test_clz},
     {"round_up_pow2", NULL, 0, 0, test_round_up_pow2},
@@ -1080,7 +1079,7 @@ parse_options(int argc, char *argv[])
         VLOG_LONG_OPTIONS,
         {NULL, 0, NULL, 0},
     };
-    char *short_options = long_options_to_short_options(long_options);
+    char *short_options = ovs_cmdl_long_options_to_short_options(long_options);
 
     for (;;) {
         int c = getopt_long(argc, argv, short_options, long_options, NULL);
@@ -1104,6 +1103,7 @@ parse_options(int argc, char *argv[])
 static void
 test_util_main(int argc, char *argv[])
 {
+    struct ovs_cmdl_context ctx = { .argc = 0, };
     set_program_name(argv[0]);
     parse_options(argc, argv);
     /* On Windows, stderr is fully buffered if connected to a pipe.
@@ -1111,7 +1111,9 @@ test_util_main(int argc, char *argv[])
      * POSIX doesn't define the circumstances in which stderr is
      * fully buffered either. */
     setvbuf(stderr, NULL, _IONBF, 0);
-    run_command(argc - optind, argv + optind, commands);
+    ctx.argc = argc - optind;
+    ctx.argv = argv + optind;
+    ovs_cmdl_run_command(&ctx, commands);
 }
 
 OVSTEST_REGISTER("test-util", test_util_main);