Merge remote-tracking branch 'origin/openbsdwork' into ronaldtse-buil…

…d-openbsd

* origin/openbsdwork:
  initial CI tests for OpenBSD

ci/before_install.sh

@@ -49,6 +49,42 @@ openbsd_install() {
   sudo pkg_add gnupg-2.1.15p2
   sudo pkg_add wget
   sudo pkg_add libiconv
+  if [ "$(id -u)" -ne 0 ]; then
+    echo "need to run as root"
+    exit 1
+  fi
+
+  export PKG_PATH="https://cloudflare.cdn.openbsd.org/pub/OpenBSD/$(uname -r)/packages/$(uname -m)"
+
+  # CI script dependencies
+  for pkg in bash git wget; do
+    pkg_info | grep -q "${pkg}" && \
+      continue
+
+    pkg_add -I "${pkg}"
+  done
+
+  rm -f /bin/bash
+  ln -s /usr/local/bin/bash /bin/bash
+  grep -q "^/bin/bash" || \
+    echo "/bin/bash" >> /etc/shells
+
+  for pkg in automake gnupg; do
+    pkg_ver="$(pkg_add -In ${pkg} 2>&1 | grep ^Ambiguous | tr ' ' '\n' | grep ${pkg}- | sort -V | tail -1)"
+
+    pkg_info | grep -q "${pkg_ver}" && \
+      continue
+
+    echo "Installing: ${pkg_ver}"
+    pkg_add -I "${pkg_ver}"
+  done
+
+  rm -f ${GPG21_INSTALL}/bin/gpg
+  ln /usr/local/bin/gpg2 ${GPG21_INSTALL}/bin/gpg
+
+  # Python will be installed as a dependency of gnupg
+  rm -f /bin/python
+  ln -s /usr/local/bin/python2.7 /bin/python
 }
 
 netbsd_install() {

ci/env-openbsd.sh

@@ -9,7 +9,7 @@ export JSONC_INSTALL="${LOCAL_BUILDS}/builds/json-c-install"
 export GPG21_INSTALL="${LOCAL_BUILDS}/builds/gpg21-install"
 export BUILD_MODE=normal
 export CLANG_FORMAT_DIFF="clang-format-diff-4.0"
-export CC=clang
+export CC=gcc
 export MAKE=gmake
 export AUTOCONF_VERSION=2.69
 export AUTOMAKE_VERSION=1.15

ci/main.sh

@@ -38,4 +38,3 @@ cd src/tests
 LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${GPG21_INSTALL}/lib"
 export LD_LIBRARY_PATH
 env RNPC_GPG_PATH="${GPG21_INSTALL}/bin/gpg" python2 cli_tests.py -w -v
-

ci/style-check.sh

@@ -11,4 +11,3 @@ if [ "$diffs" != "" ]; then
   echo "$diffs"
   exit 1
 fi
-

ci/success.sh

@@ -6,4 +6,3 @@ if [ "$BUILD_MODE" = "coverage" ]; then
   gcov-4.8 --object-file rnp_tests-rnp_tests.o rnp_tests.c
   bash <(curl -s https://codecov.io/bash)
 fi
-