diff --git a/test/cicd/Makefile.in b/test/cicd/Makefile.in index 52bf296e..3b208313 100644 --- a/test/cicd/Makefile.in +++ b/test/cicd/Makefile.in @@ -2,7 +2,7 @@ # ***** BEGIN LICENSE BLOCK ***** # # Copyright (C) 2009-2020 Olof Hagsand -1# +# # This file is part of CLIXON # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,10 +39,13 @@ SHELL = /bin/sh .PHONY: all clean distclean depend install uninstall -HOSTS = vandal.hagsand.com # i86_32 ubuntu -HOSTS += clixon.dogwood.com # FreeBSD x86_64 -#HOSTS += nuc1.hagsand.com # x86_64 ubuntu -#HOSTS += pi2.hagsand.com # arm Raspian + +HOSTS= +# The "hosts" file must exist and define the HOSTS variable +# eg : +# HOSTS += vandal.hagsand.com # i86_32 ubuntu +# ... +-include hosts SCRIPTS = cligen-mk.sh SCRIPTS += clixon-mk.sh diff --git a/test/cicd/README.md b/test/cicd/README.md index 3c54ae07..57bc5b44 100644 --- a/test/cicd/README.md +++ b/test/cicd/README.md @@ -8,7 +8,11 @@ concurrency - non-trivial with bash, eg with `make -j 10` Note there are other cicd scripts than this, such as the the "travis" scrips. -The Makefile contains a configurable HOSTS variable, please edit. +The Makefile contains a configurable HOSTS variable, which ius defined +in a "hosts" file. You must add such a file, eg: +``` + HOSTS += vandal.hagsand.com # i86_32 ubuntu +``` Logs appear in : .log. diff --git a/test/test_api.sh b/test/test_api.sh index fd1feb6f..a6c9fe27 100755 --- a/test/test_api.sh +++ b/test/test_api.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Advanced API XML test. Compile a backend plugin and start the backend, and then send an RPC to # trigger that plugin # The plugin looks in an XML tree using three different methods: @@ -209,7 +209,7 @@ clixon_plugin_init(clicon_handle h) EOF new "compile $cfile" -gcc -g -Wall -rdynamic -fPIC -shared $cfile -o $sofile +cc -g -Wall -rdynamic -fPIC -shared $cfile -o $sofile new "test params: -s running -f $cfg"