fixed logicproc and testsuite configurations

configure.ac

@@ -117,6 +117,7 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_SQLITE, test ${buildsqlite} = false)
+AM_CONDITIONAL(ENABLE_SQLITE, test ${buildsqlite} = true)
 
 # check xsltproc
 AC_CHECK_PROG([XSLTPROC],[xsltproc],[yes])
@@ -143,6 +144,8 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_MYSQL, test ${buildmysql} = false)
+AM_CONDITIONAL(ENABLE_MYSQL, test ${buildmysql} = true)
+
 
 #check pgsql support
 AC_MSG_CHECKING([postgresql support])
@@ -160,6 +163,7 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_PGSQL, test ${buildpgsql} = false)
+AM_CONDITIONAL(ENABLE_PGSQL, test ${buildpgsql} = true)
 
 
 #check rrd support
@@ -178,6 +182,7 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_RRD, test ${buildrrd} = false)
+AM_CONDITIONAL(ENABLE_RRD, test ${buildrrd} = true)
 
 #check opentsdb support
 AC_MSG_CHECKING([OpenTSDB backend])
@@ -192,6 +197,7 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_OPENTSDB, test ${buildtsdb} = false)
+AM_CONDITIONAL(ENABLE_OPENTSDB, test ${buildtsdb} = true)
 
 #check io support
 AC_MSG_CHECKING([io support])
@@ -241,7 +247,7 @@ AC_SUBST(COMPORT_485F_CFLAGS)
 #check logicproc build
 AC_MSG_CHECKING([build logic processor extension])
 buildlproc=true
-AC_ARG_ENABLE(rrd, AC_HELP_STRING([--disable-logicproc], [disable build LogicProcessor extension]),
+AC_ARG_ENABLE(logicproc, AC_HELP_STRING([--disable-logicproc], [disable build LogicProcessor extension]),
 [ if test $enableval = yes; then buildlproc=true; else buildlproc=false; fi],[ buildlproc=true; ])
 if test ${buildlproc} = true; then
 	AC_MSG_RESULT([enabled])
@@ -250,6 +256,7 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_LOGICPROC, test ${buildlproc} = false)
+AM_CONDITIONAL(ENABLE_LOGICPROC, test ${buildlproc} = true)
 
 #check build extensions
 ext=true
@@ -297,6 +304,7 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_PYTHON, test ${buildpython} = false)
+AM_CONDITIONAL(ENABLE_PYTHON, test ${buildpython} = true)
 
 #check mqtt support
 AC_MSG_CHECKING([mqtt support])
@@ -316,6 +324,7 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_MQTT, test ${buildmqtt} = false)
+AM_CONDITIONAL(ENABLE_MQTT, test ${buildmqtt} = true)
 
 
 # check Doxygen
@@ -388,6 +397,7 @@ else
 fi
 
 AM_CONDITIONAL(DISABLE_LOGDB, test ${buildlogdb} = false)
+AM_CONDITIONAL(ENABLE_LOGDB, test ${buildlogdb} = true)
 
 COV_LIBS=
 COV_CFLAGS=

extensions/Backend-OpenTSDB/Makefile.am

-if DISABLE_OPENTSDB
-
-else
-
+if ENABLE_OPENTSDB
 bin_PROGRAMS = @PACKAGE@-backend-opentsdb
 
 TSDB_VER=@LIBVER@

extensions/DBServer-MySQL/Makefile.am

-if DISABLE_MYSQL
-
-else
-
+if ENABLE_MYSQL
 UMYSQL_VER=@LIBVER@
 
 lib_LTLIBRARIES 			= libUniSet2-mysql.la

extensions/DBServer-PostgreSQL/Makefile.am

-if DISABLE_PGSQL
-
-else
-
+if ENABLE_PGSQL
 UPGSQL_VER=@LIBVER@
 
 lib_LTLIBRARIES 			= libUniSet2-pgsql.la

extensions/DBServer-SQLite/Makefile.am

-if DISABLE_SQLITE
-
-else
-
+if ENABLE_SQLITE
 USQLITE_VER=@LIBVER@
 
 lib_LTLIBRARIES = libUniSet2-sqlite.la
@@ -28,4 +25,3 @@ pkgconfig_DATA  = libUniSet2SQLite.pc
 include $(top_builddir)/include.mk
 
 endif
-								
\ No newline at end of file

extensions/IOControl/tests/Makefile.am

+if ENABLE_IO
 if HAVE_TESTS
 
 noinst_PROGRAMS = run_test_iocontrol
@@ -23,3 +24,4 @@ clean-local:
 include $(top_builddir)/include.mk
 
 endif
+endif

extensions/IOControl/tests/iocontrol-tests.at

 AT_SETUP([IOControl tests (with SM)])
+AT_SKIP_IF([$abs_top_builddir/config.status --config | grep disable-io])
 AT_CHECK([$abs_top_builddir/testsuite/at-test-launch.sh $abs_top_builddir/extensions/IOControl/tests run_test_iocontrol.sh],[0],[ignore],[ignore])
 AT_CLEANUP

extensions/LogDB/tests/Makefile.am

+if ENABLE_LOGDB
 if HAVE_TESTS
 
 include $(top_builddir)/testsuite/testsuite-common.mk
@@ -12,3 +13,4 @@ clean-local:
 include $(top_builddir)/include.mk
 
 endif
+endif

extensions/LogDB/tests/logdb-tests.at

 AT_SETUP([LogDB tests])
+AT_SKIP_IF([$abs_top_builddir/config.status --config | grep disable-logdb])
 AT_CHECK([$abs_top_builddir/testsuite/at-test-launch.sh $abs_top_builddir/extensions/LogDB/tests tests.sh],[0],[ignore],[ignore])
 AT_CLEANUP

extensions/LogDB/tests/testsuite.at

 m4_include(package.m4)
 
 AT_COLOR_TESTS
-
 AT_INIT([Loggb tests])
-
 m4_include(logdb-tests.at)

extensions/LogicProcessor/Makefile.am

-if DISABLE_LOGICPROC
-
-else
+if ENABLE_LOGICPROC
 
 # не забывайте править версию в2.pc-файле
 ULPROC_VER=@LIBVER@

extensions/LogicProcessor/tests/Makefile.am

+if ENABLE_LOGICPROC
 if HAVE_TESTS
 
 #check_PROGRAMS = tests
@@ -27,3 +28,4 @@ clean-local:
 include $(top_builddir)/include.mk
 
 endif
+endif

extensions/LogicProcessor/tests/lproc-tests.at

 AT_SETUP([LogicProcessor tests])
+AT_SKIP_IF([$abs_top_builddir/config.status --config | grep disable-logicproc])
 AT_CHECK([$abs_top_builddir/testsuite/at-test-launch.sh $abs_top_builddir/extensions/LogicProcessor/tests tests.sh],[0],[ignore],[ignore])
 AT_CLEANUP

extensions/LogicProcessor/tests/testsuite.at

 m4_include(package.m4)
 
 AT_COLOR_TESTS
-
 AT_INIT([Logic processor tests])
-   
 m4_include(lproc-tests.at)

extensions/MQTTPublisher/Makefile.am

-if DISABLE_MQTT
-
-else
-
+if ENABLE_MQTT
 bin_PROGRAMS = @PACKAGE@-mqttpublisher
 
 MQTT_VER=@LIBVER@

testsuite/at-test-launch.sh

@@ -5,4 +5,3 @@
 cd $1
 exec ./$2
 exit 1
-                                           
\ No newline at end of file

testsuite/testsuite.at

@@ -7,9 +7,9 @@ AT_INIT([Uniset test suite])
 m4_include(../tests/tests.at)
 m4_include(../extensions/SharedMemory/tests/sm-tests.at)
 m4_include(../extensions/tests/extensions-tests.at)
-m4_include(../extensions/LogicProcessor/tests/lproc-tests.at)
 m4_include(../extensions/ModbusSlave/tests/mbslave-tests.at)
 m4_include(../extensions/UNetUDP/tests/unetudp-tests.at)
 m4_include(../extensions/ModbusMaster/tests/mbmaster-tests.at)
+m4_include(../extensions/LogicProcessor/tests/lproc-tests.at)
 m4_include(../extensions/IOControl/tests/iocontrol-tests.at)
 m4_include(../extensions/LogDB/tests/logdb-tests.at)

wrappers/python/Makefile.am

-if DISABLE_PYTHON
-else
+if ENABLE_PYTHON
 SUBDIRS=lib netdata-plugin
 
 include $(top_builddir)/include.mk

wrappers/python/lib/Makefile.am

-if DISABLE_PYTHON
-else
+if ENABLE_PYTHON
 SUBDIRS=pyUniSet
 
 #lib_LTLIBRARIES = libUniSet2Python.la

wrappers/python/lib/pyUniSet/Makefile.am

-if DISABLE_PYTHON
-else
+if ENABLE_PYTHON
 
 SWIG=swig
 

wrappers/python/netdata-plugin/Makefile.am

-if DISABLE_PYTHON
-else
+if ENABLE_PYTHON
 if HAVE_NETDATA
 netdataconfdir = $(sysconfdir)/netdata/python.d
 netdataconf_DATA = *.conf