make: s/env/global/

2 files changed, 28 insertions, 28 deletions

diff --git a/tests/blogc-make/check_exec.c b/tests/blogc-make/check_exec.c
index 681e443..506c5f6 100644
--- a/tests/blogc-make/check_exec.c
+++ b/tests/blogc-make/check_exec.c
@@ -74,9 +74,9 @@ test_build_blogc_cmd_with_settings(void **state)
     bm_settings_t *settings = bc_malloc(sizeof(bm_settings_t));
     settings->settings = bc_trie_new(free);
     bc_trie_insert(settings->settings, "locale", bc_strdup("en_US.utf8"));
-    settings->env = bc_trie_new(free);
-    bc_trie_insert(settings->env, "FOO", bc_strdup("BAR"));
-    bc_trie_insert(settings->env, "BAR", bc_strdup("BAZ"));
+    settings->global = bc_trie_new(free);
+    bc_trie_insert(settings->global, "FOO", bc_strdup("BAR"));
+    bc_trie_insert(settings->global, "BAR", bc_strdup("BAZ"));
     bc_trie_t *variables = bc_trie_new(free);
     bc_trie_insert(variables, "LOL", bc_strdup("HEHE"));
 
@@ -101,7 +101,7 @@ test_build_blogc_cmd_with_settings(void **state)
 
     bc_trie_free(variables);
     bc_trie_free(settings->settings);
-    bc_trie_free(settings->env);
+    bc_trie_free(settings->global);
     free(settings);
 }
 
diff --git a/tests/blogc-make/check_settings.c b/tests/blogc-make/check_settings.c
index 93aed59..6f90291 100644
--- a/tests/blogc-make/check_settings.c
+++ b/tests/blogc-make/check_settings.c
@@ -121,14 +121,14 @@ test_settings2(void **state)
     assert_null(err);
     assert_non_null(s);
     assert_null(s->root_dir);
-    assert_int_equal(bc_trie_size(s->env), 7);
-    assert_string_equal(bc_trie_lookup(s->env, "BOLA"), "asd");
-    assert_string_equal(bc_trie_lookup(s->env, "GUDA"), "qwe");
-    assert_string_equal(bc_trie_lookup(s->env, "AUTHOR_NAME"), "chunda");
-    assert_string_equal(bc_trie_lookup(s->env, "AUTHOR_EMAIL"), "chunda@example.com");
-    assert_string_equal(bc_trie_lookup(s->env, "SITE_TITLE"), "Fuuuuuuuuu");
-    assert_string_equal(bc_trie_lookup(s->env, "SITE_TAGLINE"), "My cool tagline");
-    assert_string_equal(bc_trie_lookup(s->env, "BASE_DOMAIN"), "http://example.com");
+    assert_int_equal(bc_trie_size(s->global), 7);
+    assert_string_equal(bc_trie_lookup(s->global, "BOLA"), "asd");
+    assert_string_equal(bc_trie_lookup(s->global, "GUDA"), "qwe");
+    assert_string_equal(bc_trie_lookup(s->global, "AUTHOR_NAME"), "chunda");
+    assert_string_equal(bc_trie_lookup(s->global, "AUTHOR_EMAIL"), "chunda@example.com");
+    assert_string_equal(bc_trie_lookup(s->global, "SITE_TITLE"), "Fuuuuuuuuu");
+    assert_string_equal(bc_trie_lookup(s->global, "SITE_TAGLINE"), "My cool tagline");
+    assert_string_equal(bc_trie_lookup(s->global, "BASE_DOMAIN"), "http://example.com");
     assert_int_equal(bc_trie_size(s->settings), 17);
     assert_string_equal(bc_trie_lookup(s->settings, "source_ext"), ".txt");
     assert_string_equal(bc_trie_lookup(s->settings, "html_ext"), "/index.html");
@@ -213,14 +213,14 @@ test_settings_env2(void **state)
     assert_null(err);
     assert_non_null(s);
     assert_null(s->root_dir);
-    assert_int_equal(bc_trie_size(s->env), 7);
-    assert_string_equal(bc_trie_lookup(s->env, "BOLA"), "asd");
-    assert_string_equal(bc_trie_lookup(s->env, "GUDA"), "qwe");
-    assert_string_equal(bc_trie_lookup(s->env, "AUTHOR_NAME"), "chunda");
-    assert_string_equal(bc_trie_lookup(s->env, "AUTHOR_EMAIL"), "chunda@example.com");
-    assert_string_equal(bc_trie_lookup(s->env, "SITE_TITLE"), "Fuuuuuuuuu");
-    assert_string_equal(bc_trie_lookup(s->env, "SITE_TAGLINE"), "My cool tagline");
-    assert_string_equal(bc_trie_lookup(s->env, "BASE_DOMAIN"), "http://example.com");
+    assert_int_equal(bc_trie_size(s->global), 7);
+    assert_string_equal(bc_trie_lookup(s->global, "BOLA"), "asd");
+    assert_string_equal(bc_trie_lookup(s->global, "GUDA"), "qwe");
+    assert_string_equal(bc_trie_lookup(s->global, "AUTHOR_NAME"), "chunda");
+    assert_string_equal(bc_trie_lookup(s->global, "AUTHOR_EMAIL"), "chunda@example.com");
+    assert_string_equal(bc_trie_lookup(s->global, "SITE_TITLE"), "Fuuuuuuuuu");
+    assert_string_equal(bc_trie_lookup(s->global, "SITE_TAGLINE"), "My cool tagline");
+    assert_string_equal(bc_trie_lookup(s->global, "BASE_DOMAIN"), "http://example.com");
     assert_int_equal(bc_trie_size(s->settings), 17);
     assert_string_equal(bc_trie_lookup(s->settings, "source_ext"), ".txt");
     assert_string_equal(bc_trie_lookup(s->settings, "html_ext"), "/index.html");
@@ -305,14 +305,14 @@ test_settings_copy_files(void **state)
     assert_null(err);
     assert_non_null(s);
     assert_null(s->root_dir);
-    assert_int_equal(bc_trie_size(s->env), 7);
-    assert_string_equal(bc_trie_lookup(s->env, "BOLA"), "asd");
-    assert_string_equal(bc_trie_lookup(s->env, "GUDA"), "qwe");
-    assert_string_equal(bc_trie_lookup(s->env, "AUTHOR_NAME"), "chunda");
-    assert_string_equal(bc_trie_lookup(s->env, "AUTHOR_EMAIL"), "chunda@example.com");
-    assert_string_equal(bc_trie_lookup(s->env, "SITE_TITLE"), "Fuuuuuuuuu");
-    assert_string_equal(bc_trie_lookup(s->env, "SITE_TAGLINE"), "My cool tagline");
-    assert_string_equal(bc_trie_lookup(s->env, "BASE_DOMAIN"), "http://example.com");
+    assert_int_equal(bc_trie_size(s->global), 7);
+    assert_string_equal(bc_trie_lookup(s->global, "BOLA"), "asd");
+    assert_string_equal(bc_trie_lookup(s->global, "GUDA"), "qwe");
+    assert_string_equal(bc_trie_lookup(s->global, "AUTHOR_NAME"), "chunda");
+    assert_string_equal(bc_trie_lookup(s->global, "AUTHOR_EMAIL"), "chunda@example.com");
+    assert_string_equal(bc_trie_lookup(s->global, "SITE_TITLE"), "Fuuuuuuuuu");
+    assert_string_equal(bc_trie_lookup(s->global, "SITE_TAGLINE"), "My cool tagline");
+    assert_string_equal(bc_trie_lookup(s->global, "BASE_DOMAIN"), "http://example.com");
     assert_int_equal(bc_trie_size(s->settings), 17);
     assert_string_equal(bc_trie_lookup(s->settings, "source_ext"), ".txt");
     assert_string_equal(bc_trie_lookup(s->settings, "html_ext"), "/index.html");