tests: replacing our_version() with trutils_version()

15 files changed, 14 insertions, 27 deletions

diff --git a/tests/common.c b/tests/common.c
index a79775a..7bee69e 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -602,13 +602,4 @@ char * our_random_str(size_t min, size_t max)
 }
 
 
-void
-our_version(
-         const char *                  program_name )
-{
-   printf("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
-   printf("%s (%s) %s\n", tinyrad_lib_name(), tinyrad_pkg_name(), tinyrad_pkg_version(NULL, NULL, NULL, NULL));
-   return;
-}
-
 /* end of source */
diff --git a/tests/common.h b/tests/common.h
index 1679a23..38dee1f 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -47,6 +47,7 @@
 
 #include <tinyrad.h>
 #include <tinyrad_internal.h>
+#include <trutils.h>
 
 
 ///////////////////
@@ -136,9 +137,4 @@ our_random_str(
          size_t                        max );
 
 
-void
-our_version(
-         const char *                  program_name );
-
-
 #endif /* end of header */
diff --git a/tests/test-array-queue.c b/tests/test-array-queue.c
index ec2d463..965dba3 100644
--- a/tests/test-array-queue.c
+++ b/tests/test-array-queue.c
@@ -182,7 +182,7 @@ int main( int argc, char * argv[] )
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-array-sorted.c b/tests/test-array-sorted.c
index 5a27150..81fe07d 100644
--- a/tests/test-array-sorted.c
+++ b/tests/test-array-sorted.c
@@ -251,7 +251,7 @@ int main( int argc, char * argv[] )
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-array-stack.c b/tests/test-array-stack.c
index 61f3c2f..ba6968e 100644
--- a/tests/test-array-stack.c
+++ b/tests/test-array-stack.c
@@ -182,7 +182,7 @@ int main( int argc, char * argv[] )
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-assertions.c b/tests/test-assertions.c
index 2afd1cc..f979a06 100644
--- a/tests/test-assertions.c
+++ b/tests/test-assertions.c
@@ -132,7 +132,7 @@ main(
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-dict-attrs.c b/tests/test-dict-attrs.c
index 619a09b..1c112e9 100644
--- a/tests/test-dict-attrs.c
+++ b/tests/test-dict-attrs.c
@@ -152,7 +152,7 @@ main(
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-dict-values.c b/tests/test-dict-values.c
index 0b9223d..aa9c496 100644
--- a/tests/test-dict-values.c
+++ b/tests/test-dict-values.c
@@ -154,7 +154,7 @@ main(
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-dict-vendors.c b/tests/test-dict-vendors.c
index 8cb2e7b..0893d36 100644
--- a/tests/test-dict-vendors.c
+++ b/tests/test-dict-vendors.c
@@ -152,7 +152,7 @@ main(
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-oid-str.c b/tests/test-oid-str.c
index 9c5c18b..841e78b 100644
--- a/tests/test-oid-str.c
+++ b/tests/test-oid-str.c
@@ -188,7 +188,7 @@ int main(int argc, char * argv[])
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-options.c b/tests/test-options.c
index a72cda9..62ba5d2 100644
--- a/tests/test-options.c
+++ b/tests/test-options.c
@@ -138,7 +138,7 @@ int main( int argc, char * argv[] )
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-pckt-byte-order.c b/tests/test-pckt-byte-order.c
index 6a5ea0c..ffeca78 100644
--- a/tests/test-pckt-byte-order.c
+++ b/tests/test-pckt-byte-order.c
@@ -150,7 +150,7 @@ int main(int argc, char * argv[])
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-url-desc2str.c b/tests/test-url-desc2str.c
index 65059f2..dff8200 100644
--- a/tests/test-url-desc2str.c
+++ b/tests/test-url-desc2str.c
@@ -147,7 +147,7 @@ int main( int argc, char * argv[] )
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-url-parse.c b/tests/test-url-parse.c
index c6aab52..9eead92 100644
--- a/tests/test-url-parse.c
+++ b/tests/test-url-parse.c
@@ -142,7 +142,7 @@ int main( int argc, char * argv[] )
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':
diff --git a/tests/test-url-resolve.c b/tests/test-url-resolve.c
index 4e3a241..464ba99 100644
--- a/tests/test-url-resolve.c
+++ b/tests/test-url-resolve.c
@@ -147,7 +147,7 @@ int main( int argc, char * argv[] )
          break;
 
          case 'V':
-         our_version(PROGRAM_NAME);
+         trutils_version(PROGRAM_NAME);
          return(0);
 
          case 'v':