summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2021-10-25 05:43:53 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2021-10-25 05:43:53 +0200
commit1f0ab08301c72571b68e6c511a168669c72e9db7 (patch)
tree5da4e40340ea82511c47b7304ca7b8d1bb1ca675
parent06714b364ec243d959553741a4b134b59d88ec6f (diff)
downloadlibgphoto2-1f0ab08301c72571b68e6c511a168669c72e9db7.tar.gz
Rename libgphoto2_port test directory tests
Rename the libgphoto2_port/test directory to libgphoto2_port/tests to make its name the same as libgphoto2/tests.
-rw-r--r--.gitignore5
-rw-r--r--.travis-script.sh2
-rw-r--r--libgphoto2_port/Makefile.am2
-rw-r--r--libgphoto2_port/configure.ac2
-rw-r--r--libgphoto2_port/tests/Makefile.am (renamed from libgphoto2_port/test/Makefile.am)0
-rw-r--r--libgphoto2_port/tests/test-gp-port.c (renamed from libgphoto2_port/test/test-gp-port.c)0
-rw-r--r--libgphoto2_port/tests/test-port-list.c (renamed from libgphoto2_port/test/test-port-list.c)0
7 files changed, 8 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index ec7442053..50ac8b434 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,11 @@ Makefile.in
/libgphoto2_port/test/test-port-list.log
/libgphoto2_port/test/test-port-list.trs
/libgphoto2_port/test/test-suite.log
+/libgphoto2_port/tests/test-gp-port
+/libgphoto2_port/tests/test-port-list
+/libgphoto2_port/tests/test-port-list.log
+/libgphoto2_port/tests/test-port-list.trs
+/libgphoto2_port/tests/test-suite.log
/libtool
/packaging/generic/print-camera-list
/packaging/rpm/package.spec
diff --git a/.travis-script.sh b/.travis-script.sh
index a1d756a21..e66a6cebe 100644
--- a/.travis-script.sh
+++ b/.travis-script.sh
@@ -55,7 +55,7 @@ then
echo "\"make check\" successful."
else
s="$?"
- for log in libgphoto2_port/test/test-suite.log test/test-suite.log
+ for log in libgphoto2_port/tests/test-suite.log tests/test-suite.log
do
echo "### BEGIN LOG: $log ###"
cat "$log"
diff --git a/libgphoto2_port/Makefile.am b/libgphoto2_port/Makefile.am
index df4fa2a9b..9170736a9 100644
--- a/libgphoto2_port/Makefile.am
+++ b/libgphoto2_port/Makefile.am
@@ -26,7 +26,7 @@ bin_SCRIPTS = gphoto2-port-config
# The . stands for the current dir, i.e. the iolibs to build.
# Make sure the iolibs are built before running tests on them.
-SUBDIRS = po libgphoto2_port . test doc gphoto-m4
+SUBDIRS = po libgphoto2_port . tests doc gphoto-m4
########################################################################
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index 1a884a441..ea469d5db 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -555,7 +555,7 @@ libgphoto2_port/Makefile
libgphoto2_port.pc
libgphoto2_port-uninstalled.pc
gphoto2-port-config
-test/Makefile
+tests/Makefile
doc/Makefile
gphoto-m4/Makefile
])
diff --git a/libgphoto2_port/test/Makefile.am b/libgphoto2_port/tests/Makefile.am
index 0ed67d5b8..0ed67d5b8 100644
--- a/libgphoto2_port/test/Makefile.am
+++ b/libgphoto2_port/tests/Makefile.am
diff --git a/libgphoto2_port/test/test-gp-port.c b/libgphoto2_port/tests/test-gp-port.c
index 2737d7b2a..2737d7b2a 100644
--- a/libgphoto2_port/test/test-gp-port.c
+++ b/libgphoto2_port/tests/test-gp-port.c
diff --git a/libgphoto2_port/test/test-port-list.c b/libgphoto2_port/tests/test-port-list.c
index 7b39274d4..7b39274d4 100644
--- a/libgphoto2_port/test/test-port-list.c
+++ b/libgphoto2_port/tests/test-port-list.c