1
=== added file 'include/unity/util/SnapPath.h'
2
--- include/unity/util/SnapPath.h	1970-01-01 00:00:00 +0000
3
+++ include/unity/util/SnapPath.h	2017-03-28 18:46:38 +0000
4
@@ -0,0 +1,32 @@
5
1
/*
6
2
 * Copyright (C) 2016-2017 Canonical Ltd
7
3
 *
8
4
 * This program is free software: you can redistribute it and/or modify
9
5
 * it under the terms of the GNU Lesser General Public License version 3 as
10
6
 * published by the Free Software Foundation.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU Lesser General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU Lesser General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 *
20
16
 */
21
17
22
18
#pragma once
23
19
24
20
#include <string>
25
21
26
22
namespace unity
27
23
{
28
24
29
25
namespace util
30
26
{
31
27
32
28
    std::string prepend_snap_path(const std::string& path);
33
29
34
30
} // namespace util
35
31
36
32
} // namespace unity
37
0
33
38
=== modified file 'src/unity/util/CMakeLists.txt'
39
--- src/unity/util/CMakeLists.txt	2013-06-06 11:43:49 +0000
40
+++ src/unity/util/CMakeLists.txt	2017-03-28 18:46:38 +0000
41
@@ -4,6 +4,7 @@
42
4
    ${CMAKE_CURRENT_SOURCE_DIR}/Daemon.cpp
4
    ${CMAKE_CURRENT_SOURCE_DIR}/Daemon.cpp
43
5
    ${CMAKE_CURRENT_SOURCE_DIR}/FileIO.cpp
5
    ${CMAKE_CURRENT_SOURCE_DIR}/FileIO.cpp
44
6
    ${CMAKE_CURRENT_SOURCE_DIR}/IniParser.cpp
6
    ${CMAKE_CURRENT_SOURCE_DIR}/IniParser.cpp
45
7
    ${CMAKE_CURRENT_SOURCE_DIR}/SnapPath.cpp
46
7
)
8
)
47
8
9
48
9
set(UNITY_API_LIB_SRC ${UNITY_API_LIB_SRC} ${UTIL_SRC} PARENT_SCOPE)
10
set(UNITY_API_LIB_SRC ${UNITY_API_LIB_SRC} ${UTIL_SRC} PARENT_SCOPE)
49
10
11
50
=== added file 'src/unity/util/SnapPath.cpp'
51
--- src/unity/util/SnapPath.cpp	1970-01-01 00:00:00 +0000
52
+++ src/unity/util/SnapPath.cpp	2017-03-28 18:46:38 +0000
53
@@ -0,0 +1,37 @@
54
1
/*
55
2
 * Copyright (C) 2016-2017 Canonical Ltd
56
3
 *
57
4
 * This program is free software: you can redistribute it and/or modify
58
5
 * it under the terms of the GNU Lesser General Public License version 3 as
59
6
 * published by the Free Software Foundation.
60
7
 *
61
8
 * This program is distributed in the hope that it will be useful,
62
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
63
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
64
11
 * GNU Lesser General Public License for more details.
65
12
 *
66
13
 * You should have received a copy of the GNU Lesser General Public License
67
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
68
15
 *
69
16
 */
70
17
71
18
#include "unity/util/SnapPath.h"
72
19
73
20
namespace unity
74
21
{
75
22
76
23
namespace util
77
24
{
78
25
79
26
std::string prepend_snap_path(const std::string& path)
80
27
{
81
28
    const char* env_snap = getenv("SNAP");
82
29
    if (env_snap == nullptr) {
83
30
        return path;
84
31
    }
85
32
    return env_snap + path;
86
33
}
87
34
88
35
} // namespace util
89
36
90
37
} // namespace unity
91
0
38
92
=== modified file 'test/gtest/unity/util/CMakeLists.txt'
93
--- test/gtest/unity/util/CMakeLists.txt	2017-01-19 13:52:32 +0000
94
+++ test/gtest/unity/util/CMakeLists.txt	2017-03-28 18:46:38 +0000
95
@@ -5,4 +5,5 @@
96
5
add_subdirectory(GObjectMemory)
5
add_subdirectory(GObjectMemory)
97
6
add_subdirectory(IniParser)
6
add_subdirectory(IniParser)
98
7
add_subdirectory(ResourcePtr)
7
add_subdirectory(ResourcePtr)
99
8
add_subdirectory(SnapPath)
100
8
add_subdirectory(internal)
9
add_subdirectory(internal)
101
9
10
102
=== added directory 'test/gtest/unity/util/SnapPath'
103
=== added file 'test/gtest/unity/util/SnapPath/CMakeLists.txt'
104
--- test/gtest/unity/util/SnapPath/CMakeLists.txt	1970-01-01 00:00:00 +0000
105
+++ test/gtest/unity/util/SnapPath/CMakeLists.txt	2017-03-28 18:46:38 +0000
106
@@ -0,0 +1,4 @@
107
1
add_executable(SnapPath_test SnapPath_test.cpp)
108
2
target_link_libraries(SnapPath_test ${LIBS} ${TESTLIBS})
109
3
110
4
add_test(SnapPath SnapPath_test)
111
0
5
112
=== added file 'test/gtest/unity/util/SnapPath/SnapPath_test.cpp'
113
--- test/gtest/unity/util/SnapPath/SnapPath_test.cpp	1970-01-01 00:00:00 +0000
114
+++ test/gtest/unity/util/SnapPath/SnapPath_test.cpp	2017-03-28 18:46:38 +0000
115
@@ -0,0 +1,37 @@
116
1
/*
117
2
 * Copyright (C) 2016-2017 Canonical Ltd
118
3
 *
119
4
 * This program is free software: you can redistribute it and/or modify
120
5
 * it under the terms of the GNU Lesser General Public License version 3 as
121
6
 * published by the Free Software Foundation.
122
7
 *
123
8
 * This program is distributed in the hope that it will be useful,
124
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
125
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
126
11
 * GNU Lesser General Public License for more details.
127
12
 *
128
13
 * You should have received a copy of the GNU Lesser General Public License
129
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
130
15
 *
131
16
 */
132
17
133
18
#include "unity/util/SnapPath.h"
134
19
135
20
#include <gtest/gtest.h>
136
21
137
22
using namespace unity::util;
138
23
139
24
namespace {
140
25
141
26
TEST(Utilities, testPrependSnapPathSet) {
142
27
    ASSERT_EQ(0, setenv("SNAP", "/snap", 1));
143
28
    EXPECT_EQ("/snap/bar", prepend_snap_path("/bar"));
144
29
    ASSERT_EQ(0, unsetenv("SNAP"));
145
30
}
146
31
147
32
TEST(Utilities, testPrependSnapPathUnset) {
148
33
    ASSERT_EQ(0, unsetenv("SNAP"));
149
34
    EXPECT_EQ("/bar", prepend_snap_path("/bar"));
150
35
}
151
36
152
37
} // namespace
Status:	Merged
Approved by:	Pete Woods on 2017-03-29
Approved revision:	277
Merged at revision:	283
Proposed branch:	lp:~dobey/unity-api/add-snap-util
Merge into:	lp:unity-api
Diff against target:	152 lines (+112/-0) 6 files modified include/unity/util/SnapPath.h (+32/-0) src/unity/util/CMakeLists.txt (+1/-0) src/unity/util/SnapPath.cpp (+37/-0) test/gtest/unity/util/CMakeLists.txt (+1/-0) test/gtest/unity/util/SnapPath/CMakeLists.txt (+4/-0) test/gtest/unity/util/SnapPath/SnapPath_test.cpp (+37/-0)
To merge this branch:	bzr merge lp:~dobey/unity-api/add-snap-util
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Pete Woods (community)		2017-03-21	Approve on 2017-03-29
Unity8 CI Bot	continuous-integration		Approve on 2017-03-28
Review via email: mp+320529@code.launchpad.net