Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use even fewer single quotes 

debug travis builds
This commit is contained in:
Enno Rehling 2021-04-28 19:52:45 +02:00
parent a5534336fb
commit c87b6a8fd3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
s/runtests
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set -e set -ex
ROOT=$(git rev-parse --show-toplevel) ROOT=$(git rev-parse --show-toplevel)
export LUA_PATH="$ROOT/scripts/?.lua;$LUA_PATH" export LUA_PATH="$ROOT/scripts/?.lua;$LUA_PATH"

4
src/kernel/order.c
View File

@ -183,9 +183,9 @@ int stream_order(struct stream *out, const struct order *ord, const struct local
assert(sk != SK_MAGIC && sk < MAXSKILLS); assert(sk != SK_MAGIC && sk < MAXSKILLS);
text = skillname(sk, lang); text = skillname(sk, lang);
if (strchr(text, ' ') != NULL) { if (strchr(text, ' ') != NULL) {
swrite(" '", 1, 2, out); swrite(" \"", 1, 2, out);
swrite(text, 1, strlen(text), out); swrite(text, 1, strlen(text), out);
swrite("'", 1, 1, out); swrite("\"", 1, 1, out);
} }
else { else {
swrite(" ", 1, 1, out); swrite(" ", 1, 1, out);

2
src/kernel/order.test.c
View File

@ -461,7 +461,7 @@ static void test_study_order_quoted(CuTest *tc) {
swrite("\n", 1, 1, &out); swrite("\n", 1, 1, &out);
out.api->rewind(out.handle); out.api->rewind(out.handle);
out.api->readln(out.handle, token, sizeof(token)); out.api->readln(out.handle, token, sizeof(token));
CuAssertStrEquals(tc, "LERNE 'Waffenloser Kampf'", token); CuAssertStrEquals(tc, "LERNE \"Waffenloser Kampf\"", token);
mstream_done(&out); mstream_done(&out);
test_teardown(); test_teardown();