summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/testgitstorage.cpp3
-rw-r--r--tests/testplan.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/testgitstorage.cpp b/tests/testgitstorage.cpp
index 1b7c50fdb..ed9465386 100644
--- a/tests/testgitstorage.cpp
+++ b/tests/testgitstorage.cpp
@@ -5,6 +5,7 @@
#include "git2.h"
#include "prefs-macros.h"
#include "windowtitleupdate.h"
+#include "subsurfacestartup.h"
#include <QDir>
#include <QTextStream>
#include <QNetworkProxy>
@@ -17,7 +18,7 @@ extern "C" char *get_local_dir(const char *remote, const char *branch);
void TestGitStorage::testSetup()
{
// first, setup the preferences an proxy information
- prefs = default_prefs;
+ copy_prefs(&default_prefs, &prefs);
QCoreApplication::setOrganizationName("Subsurface");
QCoreApplication::setOrganizationDomain("subsurface.hohndel.org");
QCoreApplication::setApplicationName("Subsurface");
diff --git a/tests/testplan.cpp b/tests/testplan.cpp
index 9818a8360..e73070439 100644
--- a/tests/testplan.cpp
+++ b/tests/testplan.cpp
@@ -14,7 +14,7 @@ extern pressure_t first_ceiling_pressure;
void setupPrefs()
{
- prefs = default_prefs;
+ copy_prefs(&default_prefs, &prefs);
prefs.ascrate50 = feet_to_mm(30) / 60;
prefs.ascrate75 = prefs.ascrate50;
prefs.ascratestops = prefs.ascrate50;
@@ -24,7 +24,7 @@ void setupPrefs()
void setupPrefsVpmb()
{
- prefs = default_prefs;
+ copy_prefs(&default_prefs, &prefs);
prefs.ascrate50 = 10000 / 60;
prefs.ascrate75 = prefs.ascrate50;
prefs.ascratestops = prefs.ascrate50;