aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2012-09-03 19:54:50 +0800
committerClaudio Saavedra <csaavedra@igalia.com>2012-09-03 20:18:25 +0800
commit97d0929cf1691bc029db792e941870948a5e13e5 (patch)
tree4393c42603aefad9ca9a15e42fe3a2f5b96bfe05 /tests
parent51a379f461d8bd435054caafe265f102fb05399e (diff)
downloadgsoc2013-epiphany-97d0929cf1691bc029db792e941870948a5e13e5.tar
gsoc2013-epiphany-97d0929cf1691bc029db792e941870948a5e13e5.tar.gz
gsoc2013-epiphany-97d0929cf1691bc029db792e941870948a5e13e5.tar.bz2
gsoc2013-epiphany-97d0929cf1691bc029db792e941870948a5e13e5.tar.lz
gsoc2013-epiphany-97d0929cf1691bc029db792e941870948a5e13e5.tar.xz
gsoc2013-epiphany-97d0929cf1691bc029db792e941870948a5e13e5.tar.zst
gsoc2013-epiphany-97d0929cf1691bc029db792e941870948a5e13e5.zip
ephy-file-helpers: rename KEEP_TEMP_DIR to KEEP_DIR
Since this is also used for persistency of temporary directories, but also for --profile.
Diffstat (limited to 'tests')
-rw-r--r--tests/ephy-file-helpers-test.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
index 1fa81ad23..fcc869f8f 100644
--- a/tests/ephy-file-helpers-test.c
+++ b/tests/ephy-file-helpers-test.c
@@ -38,7 +38,7 @@ typedef struct {
static const FileInitTest private_tests[] =
{
{ "private", EPHY_FILE_HELPERS_PRIVATE_PROFILE },
- { "private, keep-dir", EPHY_FILE_HELPERS_PRIVATE_PROFILE | EPHY_FILE_HELPERS_KEEP_TEMP_DIR }
+ { "private, keep-dir", EPHY_FILE_HELPERS_PRIVATE_PROFILE | EPHY_FILE_HELPERS_KEEP_DIR }
};
static void
@@ -53,19 +53,19 @@ test_ephy_file_helpers_init ()
char *dot_dir = NULL;
gboolean private_profile = FALSE;
- gboolean keep_tmp = FALSE;
+ gboolean keep_dir = FALSE;
gboolean ensure_exists = FALSE;
test = private_tests[i];
if (test.flags & EPHY_FILE_HELPERS_PRIVATE_PROFILE) private_profile = TRUE;
- if (test.flags & EPHY_FILE_HELPERS_KEEP_TEMP_DIR) keep_tmp = TRUE;
+ if (test.flags & EPHY_FILE_HELPERS_KEEP_DIR) keep_dir = TRUE;
if (test.flags & EPHY_FILE_HELPERS_ENSURE_EXISTS) ensure_exists = TRUE;
- g_test_message ("INIT: dir: %s; private: %s; keep_tmp: %s; ensure_exists: %s",
+ g_test_message ("INIT: dir: %s; private: %s; keep_dir: %s; ensure_exists: %s",
test.dir,
private_profile ? "TRUE" : "FALSE",
- keep_tmp ? "TRUE" : "FALSE",
+ keep_dir ? "TRUE" : "FALSE",
ensure_exists ? "TRUE" : "FALSE");
g_assert (ephy_dot_dir () == NULL);
@@ -84,11 +84,11 @@ test_ephy_file_helpers_init ()
ephy_file_helpers_shutdown ();
/* Private profiles have their dot_dir inside tmp_dir. */
- g_assert (g_file_test (tmp_dir, G_FILE_TEST_EXISTS) == keep_tmp);
- g_assert (g_file_test (dot_dir, G_FILE_TEST_EXISTS) == (keep_tmp && ensure_exists));
+ g_assert (g_file_test (tmp_dir, G_FILE_TEST_EXISTS) == keep_dir);
+ g_assert (g_file_test (dot_dir, G_FILE_TEST_EXISTS) == (keep_dir && ensure_exists));
- /* Cleanup tmp-dir left behind. */
- if (keep_tmp) {
+ /* Cleanup dir left behind. */
+ if (keep_dir) {
GFile *file;
file = g_file_new_for_path (tmp_dir);