From 3a2b8fcaa52af48f89ecb95a942aad8ecbfde83a Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Fri, 16 Mar 2012 16:14:01 +1000 Subject: Use an environment variable to suppress loading of plugins. This removes the last use of the sensors_unit_test_hook function so it can be removed. Change-Id: I9f0b27fc69bfe74a151826714e3a1c0e207a7e0c Reviewed-by: Wolfgang Beck --- tests/auto/qsensor/tst_qsensor.cpp | 13 +------------ tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp | 4 +--- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp index 5a697ee3..92cb281a 100644 --- a/tests/auto/qsensor/tst_qsensor.cpp +++ b/tests/auto/qsensor/tst_qsensor.cpp @@ -117,7 +117,7 @@ class tst_QSensor : public QObject public: tst_QSensor() { - sensors_unit_test_hook(0); // change some flags the library uses + qputenv("QT_SENSORS_LOAD_PLUGINS", "0"); // Do not load plugins } private slots: @@ -924,17 +924,6 @@ private slots: sensor2.start(); QVERIFY(sensor2.isActive()); } - - // This test must be LAST or it will interfere with the other tests - void testLoadingPlugins() - { - // Go ahead and load the actual plugins (as a test that plugin loading works) - sensors_unit_test_hook(1); - - // Hmm... There's no real way to tell if this worked or not. - // If it doesn't work the unit test will probably crash. - // That's what it did on Symbian before plugin loading was fixed. - } }; QT_END_NAMESPACE diff --git a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp index fd54ea15..30e600a8 100644 --- a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp +++ b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp @@ -59,8 +59,6 @@ QDeclProximitySensor* TestSensorPlugin::stProxi = 0; QT_BEGIN_NAMESPACE -Q_SENSORS_EXPORT void sensors_unit_test_hook(int index); - class tst_Sensors2QMLAPI : public QObject { Q_OBJECT @@ -86,7 +84,7 @@ protected: void tst_Sensors2QMLAPI::initTestCase() { - sensors_unit_test_hook(0); // change some flags the library uses + qputenv("QT_SENSORS_LOAD_PLUGINS", "0"); // Do not load plugins _plugin.registerSensors(); _tilt = 0; } -- cgit v1.2.3