experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made c-compiler configurable, and added /usr/local as include path for cc and c++ tests

Browse source
This commit is contained in:
Olof Hagsand 2020-07-10 13:21:49 +00:00
parent 53deedc242
commit 94bf490a79
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/config.sh.in
View file

@ -4,4 +4,5 @@
WITH_RESTCONF=@with_restconf@ # evhtp, fcgi or "" WITH_RESTCONF=@with_restconf@ # evhtp, fcgi or ""
WITH_LIBXML2=@with_libxml2@ # yes or "" WITH_LIBXML2=@with_libxml2@ # yes or ""
CXX=@CXX@ CXX=@CXX@
CC=@CC@

3
test/test_api.sh
View file

@ -210,7 +210,8 @@ clixon_plugin_init(clicon_handle h)
EOF EOF
new "compile $cfile" new "compile $cfile"
cc -g -Wall -rdynamic -fPIC -shared $cfile -o $sofile # -I /usr/local_include for eg freebsd
expectpart "$($CC -g -Wall -rdynamic -fPIC -shared -I/usr/local/include $cfile -o $sofile)" 0 ""
new "test params: -s running -f $cfg" new "test params: -s running -f $cfg"

6
test/test_c++.sh
View file

@ -63,9 +63,6 @@ class netconf_test
{ {
private: private:
struct clixon_plugin_api api; struct clixon_plugin_api api;
plginit2_t *ca_init;
plgstart_t *ca_start;
plgexit_t *ca_exit;
public: public:
netconf_test(plginit2_t* init, plgstart_t* start, plgexit_t* exit, const char* str = "c++ netconf test") : api() netconf_test(plginit2_t* init, plgstart_t* start, plgexit_t* exit, const char* str = "c++ netconf test") : api()
@ -138,7 +135,8 @@ clixon_plugin_api* clixon_plugin_init(clicon_handle h)
EOF EOF
new "C++ compile" new "C++ compile"
expectpart "$($CXX -g -Wall -rdynamic -fPIC -shared $cfile -o $dir/backend/c++.so)" 0 "" # -I /usr/local_include for eg freebsd
expectpart "$($CXX -g -Wall -rdynamic -fPIC -shared -I/usr/local/include $cfile -o $dir/backend/c++.so)" 0 ""
new "test params: -f $cfg" new "test params: -f $cfg"
if [ $BE -ne 0 ]; then if [ $BE -ne 0 ]; then

1
test/vagrant/clixon.sh
View file

@ -72,5 +72,4 @@ cd test
echo "#!/usr/bin/env bash" > ./site.sh echo "#!/usr/bin/env bash" > ./site.sh
if [ $release = "freebsd" ]; then if [ $release = "freebsd" ]; then
echo "make=gmake" >> ./site.sh echo "make=gmake" >> ./site.sh
echo 'SKIPLIST="test_api.sh test_c++.sh"' >> ./site.sh
fi fi