Permalink
Browse files

tests: Rename capitests -> tests/c-api.

  • Loading branch information...
rwmjones committed Dec 22, 2011
1 parent 72f5487 commit 5d93d70b4d36b2337104b3dbca07722fa4d47ff5
View
@@ -13,21 +13,6 @@ appliance/supermin.d
autom4te.cache
*.bak
bindtests.tmp
-capitests/test.log
-capitests/test-add-drive-opts
-capitests/test-add-libvirt-dom
-capitests/test-command
-capitests/test-config
-capitests/test-create-handle
-capitests/test-debug-to-file
-capitests/test-just-header
-capitests/test-last-errno
-capitests/test-private-data
-capitests/test-user-cancel
-capitests/test*.img
-capitests/tests
-capitests/tests.c
-capitests/test*.tmp
cat/stamp-virt-*.pod
cat/virt-cat
cat/virt-cat.1
@@ -359,6 +344,21 @@ test1.img
test-tool/libguestfs-test-tool
test-tool/libguestfs-test-tool.1
test-tool/libguestfs-test-tool-helper
+tests/c-api/test.log
+tests/c-api/test-add-drive-opts
+tests/c-api/test-add-libvirt-dom
+tests/c-api/test-command
+tests/c-api/test-config
+tests/c-api/test-create-handle
+tests/c-api/test-debug-to-file
+tests/c-api/test-just-header
+tests/c-api/test-last-errno
+tests/c-api/test-private-data
+tests/c-api/test-user-cancel
+tests/c-api/test*.img
+tests/c-api/tests
+tests/c-api/tests.c
+tests/c-api/test*.tmp
tools/test.img
tools/virt-*.1
tools/virt-*.pl
View
@@ -30,7 +30,7 @@ SUBDIRS += appliance
endif
# Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests tests/qemu regressions extratests test-tool
+SUBDIRS += gnulib/tests tests/c-api tests/qemu regressions extratests test-tool
# Guestfish.
SUBDIRS += fish
@@ -218,7 +218,7 @@ all-local:
find $(DIST_SUBDIRS) \
-name '*.c' -o -name '*.pl' -o -name '*.pm' | \
grep -v '^perl/blib/' | \
- grep -v '^capitests/' | \
+ grep -v '^tests/' | \
grep -v '^daemon/lib/' | \
grep -v '^daemon/tests/' | \
grep -v '^examples/' | \
View
@@ -1006,7 +1006,6 @@ AC_CONFIG_FILES([run],
AC_CONFIG_FILES([Makefile
align/Makefile
appliance/Makefile
- capitests/Makefile
cat/Makefile
clone/Makefile
csharp/Makefile
@@ -1051,6 +1050,7 @@ AC_CONFIG_FILES([Makefile
sparsify/Makefile
src/Makefile
test-tool/Makefile
+ tests/c-api/Makefile
tests/qemu/Makefile
tools/Makefile])
AC_OUTPUT
View
@@ -70,7 +70,7 @@ GUESTS = $(shell virsh -c $(LIBVIRT_DEFAULT_URI) list --all | \
extra-tests: \
test-prerequisites \
- test-capitests \
+ test-c-api \
test-tools-null \
test-tools-internal \
test-df-real \
@@ -150,9 +150,9 @@ test-resize:
test-sparsify:
$(MAKE) -C ../sparsify VG="$(VG)" check
-# Run capitests under valgrind.
-test-capitests:
- $(MAKE) -C ../capitests VG="$(RUN_VG)" check
+# Run c-api tests under valgrind.
+test-c-api:
+ $(MAKE) -C ../tests/c-api VG="$(RUN_VG)" check
# Test OCaml bindings under valgrind.
test-ocaml:
View
@@ -54,10 +54,10 @@ generator_daemon.cmo: generator_utils.cmi generator_types.cmo \
generator_daemon.cmx: generator_utils.cmx generator_types.cmx \
generator_structs.cmx generator_pr.cmx generator_optgroups.cmx \
generator_docstrings.cmx generator_c.cmx generator_actions.cmx
-generator_capitests.cmo: generator_utils.cmi generator_types.cmo \
+generator_tests_c_api.cmo: generator_utils.cmi generator_types.cmo \
generator_structs.cmi generator_pr.cmi generator_optgroups.cmo \
generator_docstrings.cmo generator_actions.cmi
-generator_capitests.cmx: generator_utils.cmx generator_types.cmx \
+generator_tests_c_api.cmx: generator_utils.cmx generator_types.cmx \
generator_structs.cmx generator_pr.cmx generator_optgroups.cmx \
generator_docstrings.cmx generator_actions.cmx
generator_fish.cmo: generator_utils.cmi generator_types.cmo \
@@ -142,17 +142,17 @@ generator_errnostring.cmo: generator_utils.cmi generator_types.cmo \
generator_pr.cmi generator_docstrings.cmo
generator_errnostring.cmx: generator_utils.cmx generator_types.cmx \
generator_pr.cmx generator_docstrings.cmx
-generator_main.cmo: generator_xdr.cmo generator_structs.cmi \
- generator_ruby.cmo generator_python.cmo generator_pr.cmi \
- generator_php.cmo generator_perl.cmo generator_ocaml.cmo \
+generator_main.cmo: generator_xdr.cmo generator_tests_c_api.cmo \
+ generator_structs.cmi generator_ruby.cmo generator_python.cmo \
+ generator_pr.cmi generator_php.cmo generator_perl.cmo generator_ocaml.cmo \
generator_java.cmo generator_haskell.cmo generator_fish.cmo \
generator_errnostring.cmo generator_erlang.cmo generator_daemon.cmo \
- generator_csharp.cmo generator_capitests.cmo generator_c.cmo \
- generator_bindtests.cmo generator_api_versions.cmi
-generator_main.cmx: generator_xdr.cmx generator_structs.cmx \
- generator_ruby.cmx generator_python.cmx generator_pr.cmx \
- generator_php.cmx generator_perl.cmx generator_ocaml.cmx \
+ generator_csharp.cmo generator_c.cmo generator_bindtests.cmo \
+ generator_api_versions.cmi
+generator_main.cmx: generator_xdr.cmx generator_tests_c_api.cmx \
+ generator_structs.cmx generator_ruby.cmx generator_python.cmx \
+ generator_pr.cmx generator_php.cmx generator_perl.cmx generator_ocaml.cmx \
generator_java.cmx generator_haskell.cmx generator_fish.cmx \
generator_errnostring.cmx generator_erlang.cmx generator_daemon.cmx \
- generator_csharp.cmx generator_capitests.cmx generator_c.cmx \
- generator_bindtests.cmx generator_api_versions.cmx
+ generator_csharp.cmx generator_c.cmx generator_bindtests.cmx \
+ generator_api_versions.cmx
View
@@ -36,7 +36,7 @@ SOURCES = \
generator_c.ml \
generator_xdr.ml \
generator_daemon.ml \
- generator_capitests.ml \
+ generator_tests_c_api.ml \
generator_fish.ml \
generator_ocaml.ml \
generator_perl.ml \
@@ -2718,7 +2718,7 @@ This uses the L<blockdev(8)> command.");
[InitScratchFS, Always, TestOutput (
(* Pick a file from cwd which isn't likely to change. *)
[["mkdir"; "/upload"];
- ["upload"; "../COPYING.LIB"; "/upload/COPYING.LIB"];
+ ["upload"; "../../COPYING.LIB"; "/upload/COPYING.LIB"];
["checksum"; "md5"; "/upload/COPYING.LIB"]],
Digest.to_hex (Digest.file "COPYING.LIB"))],
"upload a file from the local machine",
@@ -2734,7 +2734,7 @@ See also C<guestfs_download>.");
[InitScratchFS, Always, TestOutput (
(* Pick a file from cwd which isn't likely to change. *)
[["mkdir"; "/download"];
- ["upload"; "../COPYING.LIB"; "/download/COPYING.LIB"];
+ ["upload"; "../../COPYING.LIB"; "/download/COPYING.LIB"];
["download"; "/download/COPYING.LIB"; "testdownload.tmp"];
["upload"; "testdownload.tmp"; "/download/upload"];
["checksum"; "md5"; "/download/upload"]],
@@ -5936,7 +5936,7 @@ See also C<guestfs_part_to_partnum>.");
("upload_offset", (RErr, [FileIn "filename"; Dev_or_Path "remotefilename"; Int64 "offset"], []), 273, [Progress],
(let md5 = Digest.to_hex (Digest.file "COPYING.LIB") in
[InitScratchFS, Always, TestOutput (
- [["upload_offset"; "../COPYING.LIB"; "/upload_offset"; "0"];
+ [["upload_offset"; "../../COPYING.LIB"; "/upload_offset"; "0"];
["checksum"; "md5"; "/upload_offset"]], md5)]),
"upload a file from the local machine with offset",
"\
@@ -5964,7 +5964,7 @@ See also C<guestfs_upload>, C<guestfs_pwrite>.");
[InitScratchFS, Always, TestOutput (
(* Pick a file from cwd which isn't likely to change. *)
[["mkdir"; "/download_offset"];
- ["upload"; "../COPYING.LIB"; "/download_offset/COPYING.LIB"];
+ ["upload"; "../../COPYING.LIB"; "/download_offset/COPYING.LIB"];
["download_offset"; "/download_offset/COPYING.LIB"; "testdownload.tmp"; offset; size];
["upload_offset"; "testdownload.tmp"; "/download_offset/COPYING.LIB"; offset];
["checksum"; "md5"; "/download_offset/COPYING.LIB"]], md5)]),
@@ -28,7 +28,7 @@ open Generator_api_versions
open Generator_c
open Generator_xdr
open Generator_daemon
-open Generator_capitests
+open Generator_tests_c_api
open Generator_fish
open Generator_ocaml
open Generator_perl
@@ -95,7 +95,7 @@ Run it from the top source directory using the command
output_to "daemon/names.c" generate_daemon_names;
output_to "daemon/optgroups.c" generate_daemon_optgroups_c;
output_to "daemon/optgroups.h" generate_daemon_optgroups_h;
- output_to "capitests/tests.c" generate_tests;
+ output_to "tests/c-api/tests.c" generate_tests;
output_to "fish/cmds_gperf.gperf" generate_fish_cmds_gperf;
output_to "fish/cmds.c" generate_fish_cmds;
output_to "fish/completion.c" generate_fish_completion;
@@ -257,8 +257,8 @@ int main (int argc, char *argv[])
exit (EXIT_FAILURE);
}
- if (guestfs_add_drive_ro (g, \"../images/test.iso\") == -1) {
- printf (\"guestfs_add_drive_ro ../images/test.iso FAILED\\n\");
+ if (guestfs_add_drive_ro (g, \"../../images/test.iso\") == -1) {
+ printf (\"guestfs_add_drive_ro ../../images/test.iso FAILED\\n\");
exit (EXIT_FAILURE);
}
View
@@ -18,8 +18,6 @@
# Regression tests and other important tests which are not
# specific to the C API. We can write these more easily in
# higher level languages than C.
-#
-# See also capitests/
include $(top_srcdir)/subdir-rules.mk
View
@@ -2799,7 +2799,7 @@ Packagers can run only certain tests by setting for example:
TEST_ONLY="vfs_type zerofree"
-See C<capitests/tests.c> for more details of how these environment
+See C<tests/c-api/tests.c> for more details of how these environment
variables work.
=head2 DEBUGGING NEW API ACTIONS
@@ -2917,10 +2917,6 @@ L<virt-alignment-scan(1)> command and documentation.
The libguestfs appliance, build scripts and so on.
-=item C<capitests>
-
-Automated tests of the C API.
-
=item C<cat>
The L<virt-cat(1)>, L<virt-filesystems(1)> and L<virt-ls(1)> commands
@@ -133,7 +133,7 @@ test_debug_to_file_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
test_debug_to_file_LDADD = \
$(top_builddir)/src/libguestfs.la \
- ../gnulib/lib/libgnu.la
+ $(top_builddir)/gnulib/lib/libgnu.la
#if HAVE_LIBVIRT
#test_add_libvirt_dom_SOURCES = test-add-libvirt-dom.c
@@ -143,7 +143,7 @@ test_debug_to_file_LDADD = \
# $(WARN_CFLAGS) $(WERROR_CFLAGS)
#test_add_libvirt_dom_LDADD = \
# $(top_builddir)/src/libguestfs.la $(LIBVIRT_LIBS) \
-# $(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+# $(LTLIBTHREAD) $(top_builddir)/gnulib/lib/libgnu.la
#endif
# Run the tests under valgrind.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -17,8 +17,6 @@
# Safety and liveness tests of components that libguestfs depends upon
# (not of libguestfs itself). Mainly this is for qemu and the kernel.
-#
-# See also capitests and regressions directories.
include $(top_srcdir)/subdir-rules.mk

0 comments on commit 5d93d70

Please sign in to comment.