[gjs: 1/3] installed-tests/js: skip a test GTK dependent, if no GTK



commit f34af98ed2d7b73eed26b3a373dc4b8c32faaf2f
Author: Claudio André <claudioandre br gmail com>
Date:   Tue Mar 27 09:23:54 2018 -0300

    installed-tests/js: skip a test GTK dependent, if no GTK
    
    Skip running testGObjectDestructionAccess.js file if built without
    GTK.

 Makefile-test.am | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/Makefile-test.am b/Makefile-test.am
index 5c9f428..bf9665c 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -199,7 +199,6 @@ common_jstests_files =                                              \
        installed-tests/js/testGIMarshalling.js                 \
        installed-tests/js/testGLib.js                          \
        installed-tests/js/testGObjectClass.js                  \
-       installed-tests/js/testGObjectDestructionAccess.js      \
        installed-tests/js/testGObjectInterface.js              \
        installed-tests/js/testGTypeClass.js                    \
        installed-tests/js/testGio.js                           \
@@ -224,9 +223,10 @@ jasmine_tests += installed-tests/js/testGDBus.js
 endif
 
 if ENABLE_GTK
-jasmine_tests +=                               \
-       installed-tests/js/testGtk.js           \
-       installed-tests/js/testLegacyGtk.js     \
+jasmine_tests +=                                               \
+       installed-tests/js/testGtk.js                           \
+       installed-tests/js/testGObjectDestructionAccess.js      \
+       installed-tests/js/testLegacyGtk.js                     \
        $(NULL)
 endif
 
@@ -234,14 +234,15 @@ if ENABLE_CAIRO
 jasmine_tests += installed-tests/js/testCairo.js
 endif
 
-EXTRA_DIST +=                                          \
-       $(common_jstests_files)                         \
-       installed-tests/js/testCairo.js                 \
-       installed-tests/js/testGtk.js                   \
-       installed-tests/js/testGDBus.js                 \
-       installed-tests/js/testLegacyGtk.js             \
-       installed-tests/extra/gjs.supp                  \
-       installed-tests/extra/lsan.supp                 \
+EXTRA_DIST +=                                                  \
+       $(common_jstests_files)                                 \
+       installed-tests/js/testCairo.js                         \
+       installed-tests/js/testGtk.js                           \
+       installed-tests/js/testGDBus.js                         \
+       installed-tests/js/testGObjectDestructionAccess.js      \
+       installed-tests/js/testLegacyGtk.js                     \
+       installed-tests/extra/gjs.supp                          \
+       installed-tests/extra/lsan.supp                         \
        $(NULL)
 
 ### TEST EXECUTION #####################################################


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