[libgda] VConnection: Fixed meson test on Data Proxy



commit 5aaf8d31c190a9cc8c073b4a071a0f596abf5135
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Jun 25 13:39:37 2018 -0500

    VConnection: Fixed meson test on Data Proxy
    
    In meson Data Proxy fails, a simple change in the time
    an object is unreferenced, do the trick. So now
    this test under meson works.

 libgda/gda-data-proxy.c       |  2 +-
 tests/data-models/meson.build | 47 ++++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/libgda/gda-data-proxy.c b/libgda/gda-data-proxy.c
index af15af735..d5fe1ce47 100644
--- a/libgda/gda-data-proxy.c
+++ b/libgda/gda-data-proxy.c
@@ -3137,8 +3137,8 @@ apply_filter_statement (GdaDataProxy *proxy, GError **error)
        /* copy filtered_rows and remove virtual table */
        GdaDataModel *copy;
        copy = (GdaDataModel*) gda_data_model_array_copy_model (filtered_rows, NULL);
-       g_object_unref (filtered_rows);
        gda_vconnection_data_model_remove (GDA_VCONNECTION_DATA_MODEL (vcnc), "proxy", NULL);
+       g_object_unref (filtered_rows);
        if (!copy) {
                g_set_error (error, GDA_DATA_PROXY_ERROR, GDA_DATA_PROXY_FILTER_ERROR,
                              "%s", _("Error in filter expression"));
diff --git a/tests/data-models/meson.build b/tests/data-models/meson.build
index 3a9fb7137..6c851c892 100644
--- a/tests/data-models/meson.build
+++ b/tests/data-models/meson.build
@@ -60,29 +60,30 @@ test('Virtual', tchkv,
                ]
        )
 
-# tchkdp = executable('check_data_proxy',
-#      ['check_data_proxy.c'] + common_sources,
-#      c_args: [
-#              '-include',
-#              meson.build_root() + '/config.h',
-#              '-DCHECK_FILES="'+meson.source_root()+'"',
-#              '-DTOP_BUILD_DIR="'+meson.build_root()+'"'
-#              ],
-#      link_with: libgda,
-#      dependencies: [
-#              libgda_dep,
-#              inc_rooth_dep,
-#              inc_sqliteh_dep
-#              ],
-#      install: false
-#      )
-# test('DataProxy', tchkdp,
-#      timeout: 100,
-#      env: [
-#              'GDA_TOP_SRC_DIR='+meson.source_root(),
-#              'GDA_TOP_BUILD_DIR='+meson.build_root()
-#              ]
-#      )
+tchkdp = executable('check_data_proxy',
+       ['check_data_proxy.c'] + common_sources,
+       c_args: [
+               '-include',
+               meson.build_root() + '/config.h',
+               '-DCHECK_FILES="'+meson.source_root()+'"',
+               '-DTOP_BUILD_DIR="'+meson.build_root()+'"'
+               ],
+       link_with: libgda,
+       dependencies: [
+               libgda_dep,
+               inc_rooth_dep,
+               inc_sqliteh_dep
+               ],
+       install: false
+       )
+test('DataProxy', tchkdp,
+       timeout: 100,
+       workdir: meson.current_build_dir(),
+       env: [
+               'GDA_TOP_SRC_DIR='+meson.source_root(),
+               'GDA_TOP_BUILD_DIR='+meson.build_root()
+               ]
+       )
 
 tchkmc = executable('check_model_copy',
        ['check_model_copy.c'] + common_sources,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]