Skip to content

Commit d227012

Browse files
author
Nate Fisher
committed
Add make install and unit tests
1 parent 179c159 commit d227012

File tree

2 files changed

+69
-63
lines changed

2 files changed

+69
-63
lines changed

‎Makefile‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
SRC_DIR = src
2-
BUILD_DIR = build
3-
TESTS_DIR = tests
4-
GTEST_DIR = googletest/googletest
5-
GTEST_INC = -I$(GTEST_DIR)/include -I$(GTEST_DIR)/include/gtest -I$(GTEST_DIR)/include/gtest/internal
1+
SRC_DIR =src
2+
BUILD_DIR =build
3+
TESTS_DIR =tests
4+
GTEST_DIR =googletest/googletest
5+
GTEST_INC =-I$(GTEST_DIR)/include -I$(GTEST_DIR)/include/gtest -I$(GTEST_DIR)/include/gtest/internal
6+
INSTALL_DIR =/opt/local/bin
67

78
all : $(BUILD_DIR)/rel/smlr
8-
@git submodule update --init
99

1010
test : $(BUILD_DIR)/rel/smlr_ut
11+
@git submodule update --init
1112
@$(BUILD_DIR)/rel/smlr_ut
1213

14+
install : $(BUILD_DIR)/rel/smlr
15+
cp $(BUILD_DIR)/rel/smlr $(INSTALL_DIR)/smlr
16+
1317
clean :
1418
rm -rf $(BUILD_DIR)
1519

‎tests/smlr_ut.cc‎

Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#include "smlr_internal.h"
88

99
void dump_smlr(smlr_t* p_smlr) {
10-
if (!p_smlr) return;
10+
if (!p_smlr)
11+
return;
1112
char buf[p_smlr->buf_bytes + 1];
1213
memcpy(buf, p_smlr->p_buf, p_smlr->buf_bytes);
1314
buf[p_smlr->buf_bytes] = '\0';
@@ -22,31 +23,31 @@ void dump_smlr(smlr_t* p_smlr) {
2223
}
2324

2425
TEST(SmlrTest, valid_new_delete_test) {
25-
smlr_t *p_smlr;
26+
smlr_t* p_smlr;
2627
EXPECT_NE(nullptr, p_smlr = smlr_new(20, ALIGN_LEFT));
27-
if (HasFailure()) dump_smlr(p_smlr);
28+
if (HasFailure())
29+
dump_smlr(p_smlr);
2830
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
29-
3031
}
3132

3233
TEST(SmlrTest, invalid_ptr_new_delete_test) {
33-
smlr_t *p_smlr;
34+
smlr_t* p_smlr;
3435
EXPECT_EQ(nullptr, p_smlr = smlr_new(0, ALIGN_LEFT));
35-
if (HasFailure()) dump_smlr(p_smlr);
36+
if (HasFailure())
37+
dump_smlr(p_smlr);
3638
EXPECT_NE(EXIT_SUCCESS, smlr_delete(p_smlr));
37-
3839
}
3940

4041
TEST(SmlrTest, invalid_alignment_new_delete_test) {
41-
smlr_t *p_smlr;
42+
smlr_t* p_smlr;
4243
EXPECT_EQ(nullptr, p_smlr = smlr_new(10, (smlr_alignment_t)10));
43-
if (HasFailure()) dump_smlr(p_smlr);
44+
if (HasFailure())
45+
dump_smlr(p_smlr);
4446
EXPECT_NE(EXIT_SUCCESS, smlr_delete(p_smlr));
45-
4647
}
4748

4849
TEST(SmlrTest, smlr_push) {
49-
smlr_t *p_smlr;
50+
smlr_t* p_smlr;
5051
uint8_t is_end = 0;
5152
EXPECT_NE(nullptr, p_smlr = smlr_new(7, ALIGN_LEFT));
5253
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, '1', &is_end));
@@ -57,14 +58,14 @@ TEST(SmlrTest, smlr_push) {
5758
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, '6', &is_end));
5859
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, '7', &is_end));
5960

60-
if (HasFailure()) dump_smlr(p_smlr);
61+
if (HasFailure())
62+
dump_smlr(p_smlr);
6163
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
62-
6364
}
6465

6566
TEST(SmlrTest, smlr_push_RIGHT) {
66-
smlr_t *p_smlr;
67-
size_t buf_sz = 5;
67+
smlr_t* p_smlr;
68+
size_t buf_sz = 5;
6869
uint8_t is_end = 0;
6970
EXPECT_NE(nullptr, p_smlr = smlr_new(buf_sz, ALIGN_RIGHT));
7071
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, '1', &is_end));
@@ -78,13 +79,14 @@ TEST(SmlrTest, smlr_push_RIGHT) {
7879

7980
EXPECT_EQ(0, memcmp(p_smlr->p_buf, truth, buf_sz));
8081

81-
if (HasFailure()) dump_smlr(p_smlr);
82+
if (HasFailure())
83+
dump_smlr(p_smlr);
8284
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
8385
}
8486

8587
TEST(SmlrTest, smlr_push_MIDDLE) {
86-
smlr_t *p_smlr;
87-
size_t buf_sz = 5;
88+
smlr_t* p_smlr;
89+
size_t buf_sz = 5;
8890
uint8_t is_end = 0;
8991
EXPECT_NE(nullptr, p_smlr = smlr_new(buf_sz, ALIGN_MIDDLE));
9092
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, '1', &is_end));
@@ -98,14 +100,14 @@ TEST(SmlrTest, smlr_push_MIDDLE) {
98100

99101
EXPECT_EQ(0, memcmp(p_smlr->p_buf, truth, buf_sz));
100102

101-
if (HasFailure()) dump_smlr(p_smlr);
103+
if (HasFailure())
104+
dump_smlr(p_smlr);
102105
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
103-
104106
}
105107

106108
TEST(SmlrTest, smlr_push_LEFT) {
107-
smlr_t *p_smlr;
108-
size_t buf_sz = 5;
109+
smlr_t* p_smlr;
110+
size_t buf_sz = 5;
109111
uint8_t is_end = 0;
110112
EXPECT_NE(nullptr, p_smlr = smlr_new(buf_sz, ALIGN_LEFT));
111113
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, '1', &is_end));
@@ -118,9 +120,9 @@ TEST(SmlrTest, smlr_push_LEFT) {
118120
char truth[] = "12345";
119121

120122
EXPECT_EQ(0, memcmp(p_smlr->p_buf, truth, buf_sz));
121-
if (HasFailure()) dump_smlr(p_smlr);
123+
if (HasFailure())
124+
dump_smlr(p_smlr);
122125
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
123-
124126
}
125127

126128
TEST(SmlrTest, smlr_push_invalid) {
@@ -129,32 +131,32 @@ TEST(SmlrTest, smlr_push_invalid) {
129131
}
130132

131133
TEST(SmlrTest, smlr_push_eof) {
132-
smlr_t *p_smlr;
134+
smlr_t* p_smlr;
133135
uint8_t is_end = 0;
134136
EXPECT_NE(nullptr, p_smlr = smlr_new(5, ALIGN_LEFT));
135137
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, EOF, &is_end));
136138
EXPECT_NE(0, is_end);
137-
if (HasFailure()) dump_smlr(p_smlr);
139+
if (HasFailure())
140+
dump_smlr(p_smlr);
138141
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
139-
140142
}
141143

142144
TEST(SmlrTest, smlr_push_not_eof) {
143-
smlr_t *p_smlr;
145+
smlr_t* p_smlr;
144146
uint8_t is_end = 0;
145147
EXPECT_NE(nullptr, p_smlr = smlr_new(5, ALIGN_LEFT));
146148
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, 'a', &is_end));
147149
EXPECT_EQ(0, is_end);
148-
if (HasFailure()) dump_smlr(p_smlr);
150+
if (HasFailure())
151+
dump_smlr(p_smlr);
149152
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
150-
151153
}
152154

153155
TEST(SmlrTest, smlr_get_buf_left_nominal_short) {
154-
smlr_t *p_smlr;
156+
smlr_t* p_smlr;
155157
const size_t buf_sz = 10;
156-
uint8_t is_end = 0;
157-
char buf[buf_sz];
158+
uint8_t is_end = 0;
159+
char buf[buf_sz];
158160
EXPECT_NE(nullptr, p_smlr = smlr_new(buf_sz, ALIGN_LEFT));
159161
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, 'a', &is_end));
160162
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, 'b', &is_end));
@@ -166,14 +168,14 @@ TEST(SmlrTest, smlr_get_buf_left_nominal_short) {
166168

167169
EXPECT_STREQ(buf, "abcdef");
168170

169-
if (HasFailure()) dump_smlr(p_smlr);
171+
if (HasFailure())
172+
dump_smlr(p_smlr);
170173
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
171-
172174
}
173175

174176
TEST(SmlrTest, smlr_internals_5) {
175-
smlr_t *p_smlr;
176-
size_t buf_sz = 5;
177+
smlr_t* p_smlr;
178+
size_t buf_sz = 5;
177179
EXPECT_NE(nullptr, p_smlr = smlr_new(buf_sz, ALIGN_MIDDLE));
178180

179181
EXPECT_EQ(0, p_smlr->index);
@@ -183,14 +185,14 @@ TEST(SmlrTest, smlr_internals_5) {
183185
EXPECT_EQ(1, p_smlr->right_bytes);
184186
EXPECT_EQ(0, p_smlr->buf_base);
185187

186-
if (HasFailure()) dump_smlr(p_smlr);
188+
if (HasFailure())
189+
dump_smlr(p_smlr);
187190
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
188-
189191
}
190192

191193
TEST(SmlrTest, smlr_internals_10) {
192-
smlr_t *p_smlr;
193-
size_t buf_sz = 10;
194+
smlr_t* p_smlr;
195+
size_t buf_sz = 10;
194196
EXPECT_NE(nullptr, p_smlr = smlr_new(buf_sz, ALIGN_MIDDLE));
195197

196198
EXPECT_EQ(0, p_smlr->index);
@@ -200,15 +202,15 @@ TEST(SmlrTest, smlr_internals_10) {
200202
EXPECT_EQ(3, p_smlr->right_bytes);
201203
EXPECT_EQ(0, p_smlr->buf_base);
202204

203-
if (HasFailure()) dump_smlr(p_smlr);
205+
if (HasFailure())
206+
dump_smlr(p_smlr);
204207
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
205-
206208
}
207209

208210
TEST(SmlrTest, smlr_left_alphabet) {
209-
smlr_t *p_smlr;
211+
smlr_t* p_smlr;
210212
const size_t buf_sz = 12;
211-
uint8_t is_end = 0;
213+
uint8_t is_end = 0;
212214
EXPECT_NE(nullptr, p_smlr = smlr_new(buf_sz, ALIGN_MIDDLE));
213215

214216
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, 'a', &is_end));
@@ -233,20 +235,20 @@ TEST(SmlrTest, smlr_left_alphabet) {
233235
EXPECT_EQ(0, p_smlr->buf_base);
234236
EXPECT_NE(0, is_end);
235237

236-
char buf_true[buf_sz+1] = "abcdefghijkl";
237-
char buf_out[buf_sz+1];
238-
EXPECT_EQ(EXIT_SUCCESS, smlr_get_buf(p_smlr, buf_out, buf_sz+1));
238+
char buf_true[buf_sz + 1] = "abcdefghijkl";
239+
char buf_out[buf_sz + 1];
240+
EXPECT_EQ(EXIT_SUCCESS, smlr_get_buf(p_smlr, buf_out, buf_sz + 1));
239241
EXPECT_STREQ(buf_true, buf_out);
240242

241-
if (HasFailure()) dump_smlr(p_smlr);
243+
if (HasFailure())
244+
dump_smlr(p_smlr);
242245
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
243-
244246
}
245247

246248
TEST(SmlrTest, smlr_left_alphabet_trunc) {
247-
smlr_t *p_smlr;
249+
smlr_t* p_smlr;
248250
const size_t buf_sz = 11;
249-
uint8_t is_end = 0;
251+
uint8_t is_end = 0;
250252
EXPECT_NE(nullptr, p_smlr = smlr_new(buf_sz, ALIGN_MIDDLE));
251253

252254
EXPECT_EQ(EXIT_SUCCESS, smlr_push(p_smlr, 'a', &is_end));
@@ -271,12 +273,12 @@ TEST(SmlrTest, smlr_left_alphabet_trunc) {
271273
EXPECT_EQ(4, p_smlr->buf_base);
272274
EXPECT_NE(0, is_end);
273275

274-
char buf_true[buf_sz+1] = "abcd...ijkl";
275-
char buf_out[buf_sz+1];
276-
EXPECT_EQ(EXIT_SUCCESS, smlr_get_buf(p_smlr, buf_out, buf_sz+1));
276+
char buf_true[buf_sz + 1] = "abcd...ijkl";
277+
char buf_out[buf_sz + 1];
278+
EXPECT_EQ(EXIT_SUCCESS, smlr_get_buf(p_smlr, buf_out, buf_sz + 1));
277279
EXPECT_STREQ(buf_true, buf_out);
278280

279-
if (HasFailure()) dump_smlr(p_smlr);
281+
if (HasFailure())
282+
dump_smlr(p_smlr);
280283
EXPECT_EQ(EXIT_SUCCESS, smlr_delete(p_smlr));
281-
282284
}

0 commit comments

Comments
 (0)