[libgda: 2/3] Merge branch 'pavlosun/libgda-wip/miscfix'

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 152728de708553b7d9a797cee4b9cec3076e15e9
Merge: 79ba4b505 609e1cacc
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Wed Feb 6 09:54:07 2019 -0600

    Merge branch 'pavlosun/libgda-wip/miscfix'

 .gitlab-ci.yml               |  4 ++--
 date.c                       |  6 ------
 meson.build                  |  2 +-
 meson_options.txt            |  1 -
 tests/db/meson.build         |  3 +--
 tests/meson.build            | 11 +----------
 tests/meta-store/meson.build |  1 -
 7 files changed, 5 insertions(+), 23 deletions(-)
---
diff --cc .gitlab-ci.yml
index 482a1ca7b,e5231c8a4..7dc2a0ae9
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -127,7 -127,7 +127,7 @@@ meson_build
    script:
    - export PGPASSWORD=$POSTGRES_PASSWORD
    - psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "SELECT 'OK' AS status;"
-   - meson _build --prefix=/usr -Denable-ci-environment=true -Denable-debug=true -Denable-gtk-doc=true
 -  - meson _build --prefix=/usr -Denable-debug=true
++  - meson _build --prefix=/usr -Denable-debug=true -Denable-gtk-doc=true
    - cd _build
    - ninja
    - broadwayd &
@@@ -168,4 -168,4 +168,4 @@@ pages
    - mv doc/C/libgdaui/html public/C/libgdaui-6.0
    artifacts:
      paths:
--    - public
++    - public
diff --cc meson_options.txt
index 50f1efa37,9a2f2f4e8..27a3f2261
--- a/meson_options.txt
+++ b/meson_options.txt
@@@ -14,8 -14,6 +14,7 @@@ option('system-sqlite', type : 'boolean
  option('with-examples', type : 'boolean', value : false, description : 'Compile examples [default=false')
  option('system-sqlcipher', type : 'boolean', value : true, description : 'Use SQLCipher installed on the 
system [default=false')
  option('enable-tools', type : 'boolean', value : false, description : 'Enable build GUI Tools')
- option('enable-ci-environment', type : 'boolean', value : false, description : 'Enable Continous 
Integration Environment test')
  option('glade-catalog-dir', type : 'string', value : '', description : 'Use the given directory to install 
glade catalog files. If glade is not available this option is ignored. If it is not given the valaue from 
pkg-config will be used')
  option('glade-pixmap-dir', type : 'string', value : '', description : 'Use the given directory to install 
glade pixmap files. If glade is not available this option is ignored. If it is not given the valaue from 
pkg-config will be used')
 +option('enable-gtk-doc', type : 'boolean', value : false, description : 'Enable documentation generation 
[default = false]')