From 168d177197bd7558bbe0ca13d01c984ad8638da7 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 9 Mar 2021 14:39:51 -0800 Subject: This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal --- indra/llvfs/tests/lldiriterator_test.cpp | 65 -------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 indra/llvfs/tests/lldiriterator_test.cpp (limited to 'indra/llvfs/tests/lldiriterator_test.cpp') diff --git a/indra/llvfs/tests/lldiriterator_test.cpp b/indra/llvfs/tests/lldiriterator_test.cpp deleted file mode 100644 index a65e3dada5..0000000000 --- a/indra/llvfs/tests/lldiriterator_test.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/** - * @file lldiriterator_test.cpp - * @date 2011-06 - * @brief LLDirIterator test cases. - * - * $LicenseInfo:firstyear=2011&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2011, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only., - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "linden_common.h" -#include "lltut.h" -#include "../lldiriterator.h" - - -namespace tut -{ - - struct LLDirIteratorFixture - { - LLDirIteratorFixture() - { - } - }; - typedef test_group LLDirIteratorTest_factory; - typedef LLDirIteratorTest_factory::object LLDirIteratorTest_t; - LLDirIteratorTest_factory tf("LLDirIterator"); - - /* - CHOP-662 was originally introduced to deal with crashes deleting files from - a directory (VWR-25500). However, this introduced a crash looking for - old chat logs as the glob_to_regex function in lldiriterator wasn't escaping lots of regexp characters - */ - void test_chop_662(void) - { - // Check a selection of bad group names from the crash reports - LLDirIterator iter(".","+bad-group-name]+?\?-??.*"); - LLDirIterator iter1(".","))--@---bad-group-name2((?\?-??.*\\.txt"); - LLDirIterator iter2(".","__^v--x)Cuide d sua vida(x--v^__?\?-??.*"); - } - - template<> template<> - void LLDirIteratorTest_t::test<1>() - { - test_chop_662(); - } - -} -- cgit v1.2.3