fixup broken build (#77)

* Test builds only on linux

* linux distro of choice is ubuntu 16.04 (xenial)

* update nginx versions to latest

travis builds use the latest versions for mainline, stable and legacy
releases of nginx

* matrix is now called jobs in travis

* no more sudo

sudo is anyways deprecated. also, travis now offers native directives to
install OS packages; so use those

* name build stages

move away from doing the actual build as a "before install" step. We now
have labelled staged to better understand things

* Move travis env prep to makefile

* be silent in source download and extraction

* migrate travis env prep steps to makefile

* removed reference to outdated cmocka

* use the newer gitlab hosted cmocka

* find the ngx object files just in time

the earlier implementation was building the nginx source files list at
start of build. this will be an empty list in a clean build environment.
hence we need to build this list after completion of the build

Author: anomalizer

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "vendor/cmocka"]
 	path = vendor/cmocka
-	url = https://github.com/clibs/cmocka.git
+	url = https://gitlab.com/cmocka/cmocka.git

.travis.yml

@@ -1,26 +1,30 @@
 language: c
 
+os:
+  - linux
+dist: xenial
+addons:
+  apt:
+    packages:
+      - libpcre3
+      - libpcre3-dev
+      - zlib1g-dev
+      - libssl-dev
+
 env:
-  matrix:
+  jobs:
     # one separate build per nginx version
     #mainline verion
-    - NGINX_VERSION=1.13.6
+    - NGINX_VERSION=1.19.4
     #stable verions
-    - NGINX_VERSION=1.12.1
+    - NGINX_VERSION=1.18.0
     #legacy verions
-    - NGINX_VERSION=1.10.3
-    - NGINX_VERSION=1.8.1
+    - NGINX_VERSION=1.16.1
+    - NGINX_VERSION=1.14.2
   global:
-    - NGX_PATH=~/nginx
     - LD_LIBRARY_PATH=/lib:/usr/lib:/usr/local/lib
 
-sudo: true
-
-before_install:
-  - sudo apt-get install libpcre3 libpcre3-dev zlib1g-dev libssl-dev
-  - cd && wget https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz && tar -xvzf nginx-$NGINX_VERSION.tar.gz && ln -s nginx-$NGINX_VERSION $NGX_PATH
-  - cd $NGX_PATH && ./configure --with-http_ssl_module --add-module=$TRAVIS_BUILD_DIR
-  - cd $TRAVIS_BUILD_DIR && make nginx
-
 script:
-  - make test
+  make prepare-travis-env nginx test
+
+ # vim: ts=2 sw=2

Makefile

@@ -7,10 +7,16 @@ all:
 %.o: %.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 
-.PHONY: all clean test nginx
+.PHONY: all clean test nginx prepare-travis-env
 
 
-NGX_OBJS := $(shell find ${NGX_PATH}/objs -name \*.o)
+NGX_PATH := $(shell echo `pwd`/nginx)
+
+prepare-travis-env:
+	wget --no-verbose https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
+	tar -xzf nginx-${NGINX_VERSION}.tar.gz
+	ln -s nginx-${NGINX_VERSION} ${NGX_PATH}
+	cd ${NGX_PATH} && ./configure --with-http_ssl_module --add-module=${TRAVIS_BUILD_DIR}
 
 nginx:
 	cd ${NGX_PATH} && rm -rf ${NGX_PATH}/objs/src/core/nginx.o && make
@@ -24,7 +30,7 @@ vendor/cmocka:
 test: .cmocka_build | nginx
 	strip -N main -o ${NGX_PATH}/objs/src/core/nginx_without_main.o ${NGX_PATH}/objs/src/core/nginx.o \
 	&& mv ${NGX_PATH}/objs/src/core/nginx_without_main.o ${NGX_PATH}/objs/src/core/nginx.o \
-	&& $(CC) test_suite.c $(CFLAGS) -o test_suite -lcmocka ${NGX_OBJS} -ldl -lpthread -lcrypt -lssl -lpcre -lcrypto -lz \
+	&& $(CC) test_suite.c $(CFLAGS) -o test_suite -lcmocka `find ${NGX_PATH}/objs -name \*.o` -ldl -lpthread -lcrypt -lssl -lpcre -lcrypto -lz \
 	&& ./test_suite
 
 clean: