tests: rename test-rollsum to test-rollsum-cli

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

diff --git a/Makefile-tests.am b/Makefile-tests.am
index 6f82477bb63c345e2c46439f779ffdaa8d41413d..acfbe525342a7b2e87b3f27012adff7a734b8071 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -125,7 +125,7 @@ libreaddir_rand_la_LDFLAGS = -avoid-version
 endif
 
 # "make check" do not depend from --enable-installed-tests
-noinst_PROGRAMS += tests/test-rollsum
+noinst_PROGRAMS += tests/test-rollsum-cli
 
 TESTS = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \
        tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \
@@ -138,9 +138,9 @@ TESTS_ENVIRONMENT = \
 TESTS_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/libglnx
 TESTS_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
 
-tests_test_rollsum_SOURCES = src/libostree/ostree-rollsum.c tests/test-rollsum.c
-tests_test_rollsum_CFLAGS = $(TESTS_CFLAGS) $(OT_DEP_ZLIB_CFLAGS)
-tests_test_rollsum_LDADD = libbupsplit.la $(TESTS_LDADD) $(OT_DEP_ZLIB_LIBS)
+tests_test_rollsum_cli_SOURCES = src/libostree/ostree-rollsum.c tests/test-rollsum-cli.c
+tests_test_rollsum_cli_CFLAGS = $(TESTS_CFLAGS) $(OT_DEP_ZLIB_CFLAGS)
+tests_test_rollsum_cli_LDADD = libbupsplit.la $(TESTS_LDADD) $(OT_DEP_ZLIB_LIBS)
 
 tests_test_mutable_tree_CFLAGS = $(TESTS_CFLAGS)
 tests_test_mutable_tree_LDADD = $(TESTS_LDADD)

diff --git a/tests/test-rollsum-cli.c b/tests/test-rollsum-cli.c
new file mode 100644 (file)
index 0000000..4f24477
--- /dev/null
+++ b/tests/test-rollsum-cli.c
@@ -0,0 +1,73 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ *
+ * Copyright (C) 2013 Colin Walters <walters@verbum.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include "ostree-rollsum.h"
+#include <unistd.h>
+#include <stdlib.h>
+
+int
+main (int argc, char **argv)
+{
+  GError *local_error = NULL;
+  GError **error = &local_error;
+  GBytes *from_bytes = NULL;
+  GBytes *to_bytes = NULL;
+  const char *from_path;
+  const char *to_path;
+  OstreeRollsumMatches *matches;
+  GMappedFile *mfile;
+
+  g_setenv ("GIO_USE_VFS", "local", TRUE);
+
+  if (argc < 3)
+    exit (EXIT_FAILURE);
+
+  from_path = argv[1];
+  to_path = argv[2];
+
+  mfile = g_mapped_file_new (from_path, FALSE, error);
+  if (!mfile)
+    goto out;
+  from_bytes = g_mapped_file_get_bytes (mfile);
+  g_mapped_file_unref (mfile);
+  mfile = g_mapped_file_new (to_path, FALSE, error);
+  if (!mfile)
+    goto out;
+  to_bytes = g_mapped_file_get_bytes (mfile);
+  g_mapped_file_unref (mfile);
+
+  matches = _ostree_compute_rollsum_matches (from_bytes, to_bytes);
+
+  g_printerr ("rollsum crcs=%u bufs=%u total=%u matchsize=%llu\n",
+              matches->crcmatches,
+              matches->bufmatches,
+              matches->total, (unsigned long long)matches->match_size);
+
+ out:
+  if (local_error)
+    {
+      g_printerr ("%s\n", local_error->message);
+      g_error_free (local_error);
+      return 1;
+    }
+  return 0;
+}

diff --git a/tests/test-rollsum.c b/tests/test-rollsum.c
deleted file mode 100644 (file)
index 4f24477..0000000
--- a/tests/test-rollsum.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2013 Colin Walters <walters@verbum.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include "ostree-rollsum.h"
-#include <unistd.h>
-#include <stdlib.h>
-
-int
-main (int argc, char **argv)
-{
-  GError *local_error = NULL;
-  GError **error = &local_error;
-  GBytes *from_bytes = NULL;
-  GBytes *to_bytes = NULL;
-  const char *from_path;
-  const char *to_path;
-  OstreeRollsumMatches *matches;
-  GMappedFile *mfile;
-
-  g_setenv ("GIO_USE_VFS", "local", TRUE);
-
-  if (argc < 3)
-    exit (EXIT_FAILURE);
-
-  from_path = argv[1];
-  to_path = argv[2];
-
-  mfile = g_mapped_file_new (from_path, FALSE, error);
-  if (!mfile)
-    goto out;
-  from_bytes = g_mapped_file_get_bytes (mfile);
-  g_mapped_file_unref (mfile);
-  mfile = g_mapped_file_new (to_path, FALSE, error);
-  if (!mfile)
-    goto out;
-  to_bytes = g_mapped_file_get_bytes (mfile);
-  g_mapped_file_unref (mfile);
-
-  matches = _ostree_compute_rollsum_matches (from_bytes, to_bytes);
-
-  g_printerr ("rollsum crcs=%u bufs=%u total=%u matchsize=%llu\n",
-              matches->crcmatches,
-              matches->bufmatches,
-              matches->total, (unsigned long long)matches->match_size);
-
- out:
-  if (local_error)
-    {
-      g_printerr ("%s\n", local_error->message);
-      g_error_free (local_error);
-      return 1;
-    }
-  return 0;
-}