summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-08-10 00:13:20 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-08-10 00:13:20 +0200
commit5ef2f20a6ef09aaf97284a47e2cb8f1d1666edb0 (patch)
tree2f561fb7b132f4d6995f45365f30c2730699e6fc
parent7e949de1d23e2cc40df68160bb19e9c0b3c6bb4c (diff)
downloadcurl-5ef2f20a6ef09aaf97284a47e2cb8f1d1666edb0.tar.gz
travis: verify "make install" as well
-rw-r--r--.travis.yml6
-rw-r--r--scripts/installcheck.sh20
2 files changed, 25 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 43c1e25d4..5ba6267d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -111,8 +111,12 @@ script:
./configure
make
./maketgz 99.98.97
- (tar xf curl-99.98.97.tar.gz && cd curl-99.98.97 && ./configure && make && make TFLAGS=1 test)
+ # verify in-tree build
+ (tar xf curl-99.98.97.tar.gz && cd curl-99.98.97 && ./configure --prefix=$HOME/temp && make && make TFLAGS=1 test)
+ # install and do a basic check
+ (cd curl-99.98.97 && make install && bash scripts/installcheck.sh $HOME/temp)
rm -rf curl-99.98.97
+ # verify out-of-tree build
(tar xf curl-99.98.97.tar.gz && mkdir build && cd build && ../curl-99.98.97/configure && make && make TFLAGS=1 test)
fi
diff --git a/scripts/installcheck.sh b/scripts/installcheck.sh
new file mode 100644
index 000000000..2194da2ee
--- /dev/null
+++ b/scripts/installcheck.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+PREFIX=$1
+
+# Run this script in the root of the git clone. Point out the install prefix
+# where 'make install' has already installed curl.
+
+if test -z "$1"; then
+ echo "scripts/installcheck.sh [PREFIX]"
+ exit
+fi
+
+diff -u <(find docs/libcurl/ -name "*.3" -printf "%f\n" | grep -v template| sort) <(find $PREFIX/share/man/ -name "*.3" -printf "%f\n" | sort)
+
+if test "$?" -ne "0"; then
+ echo "ERROR: libcurl docs mismatch"
+ exit
+fi
+
+diff -u <(find include/ -name "*.h" -printf "%f\n" | sort) <(find $PREFIX/include/ -name "*.h" -printf "%f\n" | sort)