Merge lp:~dobey/unity-scope-click/arch-override into lp:unity-scope-click/devel

[dobey]

Add support for overriding the architecture in search, for testing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/124

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/150/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'libclickscope/click/configuration.cpp'
--- libclickscope/click/configuration.cpp	2014-05-22 16:33:56 +0000
+++ libclickscope/click/configuration.cpp	2014-06-25 21:36:12 +0000
@@ -92,7 +92,12 @@
 
 std::string Configuration::get_architecture()
 {
-    static const std::string arch{architectureFromDpkg()};
+    const char* env_arch = getenv(ARCH_ENVVAR);
+    static const std::string deb_arch {architectureFromDpkg()};
+    if (env_arch == NULL) {
+        return deb_arch;
+    }
+    static const std::string arch {env_arch};
     return arch;
 }
 

=== modified file 'libclickscope/click/configuration.h'
--- libclickscope/click/configuration.h	2014-05-21 19:44:20 +0000
+++ libclickscope/click/configuration.h	2014-06-25 21:36:12 +0000
@@ -42,6 +42,7 @@
     constexpr static const char* FRAMEWORKS_FOLDER {"/usr/share/click/frameworks/"};
     constexpr static const char* FRAMEWORKS_PATTERN {"*.framework"};
     constexpr static const int FRAMEWORKS_EXTENSION_LENGTH = 10; // strlen(".framework")
+    constexpr static const char* ARCH_ENVVAR {"U1_SEARCH_ARCH"};
     constexpr static const char* LANGUAGE_ENVVAR {"LANGUAGE"};
     static const std::vector<const char*> FULL_LANG_CODES;
 

=== modified file 'libclickscope/tests/test_configuration.cpp'
--- libclickscope/tests/test_configuration.cpp	2014-05-21 19:44:20 +0000
+++ libclickscope/tests/test_configuration.cpp	2014-06-25 21:36:12 +0000
@@ -184,3 +184,16 @@
 {    
     ASSERT_FALSE(Configuration::is_full_lang_code("en_US"));
 }
+
+TEST(Configuration, getArchitectureOverride)
+{
+    ASSERT_EQ(setenv(Configuration::ARCH_ENVVAR, "otherarch", 1), 0);
+    EXPECT_EQ("otherarch", Configuration().get_architecture());
+    ASSERT_EQ(unsetenv(Configuration::ARCH_ENVVAR), 0);
+}
+
+TEST(Configuration, getArchitectureSystem)
+{
+    ASSERT_EQ(unsetenv(Configuration::ARCH_ENVVAR), 0);
+    ASSERT_NE("otherarch", Configuration().get_architecture());
+}