Skip to content

Commit f9c970c

Browse files
committed
Fix tests
1 parent 583ee8c commit f9c970c

File tree

10 files changed

+155
-221
lines changed

10 files changed

+155
-221
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
*.o
22
cosmopolitan/
33
inih/
4+
.vscode/
5+
.cache/

.vscode/c_cpp_properties.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

.vscode/launch.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

.vscode/tasks.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ I've learned some things:
1111
- Continue to implement undeploy
1212
- Continue to properly test
1313
- Explicitly specify if file/directory
14-
- That way, a directory can exist at source location (with multiple choices)
15-
14+
- That way, a directory can exist at source location (with multiple choices)
1615
- Implement interactive mode
1716
- Implement command to interactively swap out file
1817
- Make status updates one line

meson.build

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,36 @@ my_dep = declare_dependency(link_with : my_lib,
3030
build_args = [
3131
]
3232
project_source_files = [
33-
'bin/d.c'
33+
'bin/d.c'
3434
]
3535
project_dependencies = [
3636
my_dep
3737
]
3838
build_args += [
39-
'-DPROJECT_NAME=' + meson.project_name(),
40-
'-DPROJECT_VERSION=' + meson.project_version(),
39+
'-DPROJECT_NAME=' + meson.project_name(),
40+
'-DPROJECT_VERSION=' + meson.project_version(),
4141
]
4242

4343

4444

4545
project_dependencies += inih_dep
4646
project_target = executable(
47-
meson.project_name(),
48-
project_source_files,
49-
dependencies: project_dependencies,
50-
install : false,
47+
meson.project_name(),
48+
project_source_files,
49+
dependencies: project_dependencies,
50+
install : false,
5151
include_directories : my_inc2,
52-
c_args : build_args,
52+
c_args : build_args,
5353
)
5454

55-
test('basic', project_target)
55+
test_main = executable(
56+
'test_main',
57+
'test/test.c',
58+
dependencies: project_dependencies,
59+
# link_with: project_dependencies,
60+
install : false,
61+
include_directories : my_inc2,
62+
c_args : build_args,
63+
)
64+
65+
test('basic', test_main)

src/util.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ struct ExpandStringResult expand_string(char *input, struct ExpandStringVars var
158158
strncat(output, start, dollar - start);
159159

160160
char *var = malloc(right - left);
161+
memset(var, 0, right - left);
161162
strncat(var, left + 1, right - left - 1);
162163
bool found = false;
163164
for (unsigned int i = 0; i < vars.len; ++i) {

test.c

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)