From 3265948458a44f3616e92e15be20aeca157074b5 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Thu, 9 Feb 2017 17:53:02 +0100 Subject: [PATCH] Fix ExcludedFilesTest on macOS Use the same logic to find sync-exclude as check_csync_exclude.c --- test/testexcludedfiles.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp index 547770ee9..b52bfb5a9 100644 --- a/test/testexcludedfiles.cpp +++ b/test/testexcludedfiles.cpp @@ -11,9 +11,7 @@ using namespace OCC; -#define STR_(X) #X -#define STR(X) STR_(X) -#define BIN_PATH STR(OWNCLOUD_BIN_PATH) +#define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst" class TestExcludedFiles: public QObject { @@ -31,9 +29,7 @@ private slots: QVERIFY(!excluded.isExcluded("/a/.b", "/a", keepHidden)); QVERIFY(excluded.isExcluded("/a/.b", "/a", excludeHidden)); - QString path(BIN_PATH); - path.append("/sync-exclude.lst"); - excluded.addExcludeFilePath(path); + excluded.addExcludeFilePath(EXCLUDE_LIST_FILE); excluded.reloadExcludes(); QVERIFY(!excluded.isExcluded("/a/b", "/a", keepHidden)); -- 2.39.5