Permalink
Browse files

Rename test-integration to test-umockdev-run

  • Loading branch information...
1 parent 17db3be commit 9608a7f41f50ad437ed70f28d9d9dbdd52b64439 Martin Pitt committed Feb 25, 2013
Showing with 15 additions and 15 deletions.
  1. +2 −2 .gitignore
  2. +8 −8 Makefile.am
  3. +5 −5 tests/{test-integration.vala → test-umockdev-run.vala}
View
4 .gitignore
@@ -37,7 +37,7 @@ tests/test-ioctl-tree
tests/test-umockdev-vala.c
tests/test-umockdev
tests/test-umockdev-vala
-tests/test-integration
-tests/test-integration.c
+tests/test-umockdev-run
+tests/test-umockdev-run.c
tests/test-umockdev-record
tests/test-umockdev-record.c
View
16 Makefile.am
@@ -247,7 +247,7 @@ check-local: UMockdev-1.0.typelib
endif
-noinst_PROGRAMS += tests/test-umockdev-vala tests/test-integration tests/test-umockdev-record
+noinst_PROGRAMS += tests/test-umockdev-vala tests/test-umockdev-run tests/test-umockdev-record
tests_test_umockdev_vala_SOURCES = \
tests/test-umockdev-vala.vala \
@@ -265,14 +265,14 @@ tests_test_umockdev_vala_VALAFLAGS = \
--pkg gudev-1.0 \
$(NULL)
-tests_test_integration_SOURCES = \
- tests/test-integration.vala \
+tests_test_umockdev_run_SOURCES = \
+ tests/test-umockdev-run.vala \
tests/assertions.vapi \
$(NULL)
-tests_test_integration_CFLAGS = $(GLIB_CFLAGS) -w
-tests_test_integration_LDADD = $(GLIB_LIBS)
-tests_test_integration_VALAFLAGS = \
+tests_test_umockdev_run_CFLAGS = $(GLIB_CFLAGS) -w
+tests_test_umockdev_run_LDADD = $(GLIB_LIBS)
+tests_test_umockdev_run_VALAFLAGS = \
--vapidir tests \
--pkg glib-2.0 \
--pkg posix \
@@ -296,14 +296,14 @@ tests_test_umockdev_record_VALAFLAGS = \
DISTCLEANFILES += \
tests/test-umockdev-vala.c \
- tests/test-integration.c \
+ tests/test-umockdev-run.c \
tests/test-umockdev-record.c \
$(srcdir)/tests_test_umockdev_vala_vala.stamp \
$(srcdir)/tests_test_integration_vala.stamp \
$(srcdir)/tests_test_umockdev_record_vala.stamp \
$(NULL)
-TESTS += tests/test-umockdev-vala tests/test-integration tests/test-umockdev-record
+TESTS += tests/test-umockdev-vala tests/test-umockdev-run tests/test-umockdev-record
endif
View
10 tests/test-integration.vala → tests/test-umockdev-run.vala
@@ -1,5 +1,5 @@
/*
- * test-integration.vala
+ * test-umockdev-run.vala
*
* Copyright (C) 2013 Canonical Ltd.
* Author: Martin Pitt <martin.pitt@ubuntu.com>
@@ -212,12 +212,12 @@ main (string[] args)
Test.add_func ("/umockdev-run/invalid-args", t_run_invalid_args);
// tests with gphoto2 program for PowerShot
- Test.add_func ("/umockdev-integration/gphoto-detect", t_gphoto_detect);
- Test.add_func ("/umockdev-integration/gphoto-folderlist", t_gphoto_folderlist);
- Test.add_func ("/umockdev-integration/gphoto-filelist", t_gphoto_filelist);
+ Test.add_func ("/umockdev-run/integration/gphoto-detect", t_gphoto_detect);
+ Test.add_func ("/umockdev-run/integration/gphoto-folderlist", t_gphoto_folderlist);
+ Test.add_func ("/umockdev-run/integration/gphoto-filelist", t_gphoto_filelist);
// input devices
- Test.add_func ("/umockdev-integration/input-touchpad", t_input_touchpad);
+ Test.add_func ("/umockdev-run/integration/input-touchpad", t_input_touchpad);
return Test.run();
}

0 comments on commit 9608a7f

Please sign in to comment.