From d4aebd30de52142406bde6cdc93d983123e000b6 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 20 Feb 2018 14:29:45 +0100 Subject: Utility::fsCasePreserving: remove UNIT_TESTING ifdef Since the release package will be build with unit test, we don't want to query the env variable at every call to fsCasePreserving. So only test the env variable at startup. And the testutility can still change the value. (The env variable is still used from t8.pl and maybe smashbox) Issue #6318 --- test/testutility.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/testutility.cpp b/test/testutility.cpp index c83b14199..1c538c58f 100644 --- a/test/testutility.cpp +++ b/test/testutility.cpp @@ -11,6 +11,10 @@ using namespace OCC::Utility; +namespace OCC { +OCSYNC_EXPORT extern bool fsCasePreserving_override; +} + class TestUtility : public QObject { Q_OBJECT @@ -150,12 +154,12 @@ private slots: void testFsCasePreserving() { - qputenv("OWNCLOUD_TEST_CASE_PRESERVING", "1"); + QVERIFY(isMac() || isWindows() ? fsCasePreserving() : ! fsCasePreserving()); + QScopedValueRollback scope(OCC::fsCasePreserving_override); + OCC::fsCasePreserving_override = 1; QVERIFY(fsCasePreserving()); - qputenv("OWNCLOUD_TEST_CASE_PRESERVING", "0"); + OCC::fsCasePreserving_override = 0; QVERIFY(! fsCasePreserving()); - qunsetenv("OWNCLOUD_TEST_CASE_PRESERVING"); - QVERIFY(isMac() || isWindows() ? fsCasePreserving() : ! fsCasePreserving()); } void testFileNamesEqual() @@ -178,13 +182,12 @@ private slots: QVERIFY(fileNamesEqual(a+"/test", b+"/test")); // both exist QVERIFY(fileNamesEqual(a+"/test/TESTI", b+"/test/../test/TESTI")); // both exist - qputenv("OWNCLOUD_TEST_CASE_PRESERVING", "1"); + QScopedValueRollback scope(OCC::fsCasePreserving_override, true); QVERIFY(fileNamesEqual(a+"/test", b+"/TEST")); // both exist QVERIFY(!fileNamesEqual(a+"/test", b+"/test/TESTI")); // both are different dir.remove(); - qunsetenv("OWNCLOUD_TEST_CASE_PRESERVING"); } -- cgit v1.2.3