aboutsummaryrefslogtreecommitdiffhomepage
path: root/fish_tests.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-05-09 16:07:11 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2014-05-09 16:07:11 -0700
commitd554b7da08f18b006625805d3ba372de2de61997 (patch)
treed1bed65f3febb7a415fb3ac36e699cd9b5be2f45 /fish_tests.cpp
parente97bec10eafec80d55e6e6b538a94597f3a6425d (diff)
parentcd7f1a15f86fd045d069d256ea7333d14c2913fa (diff)
Merge branch 'master' into death_of_fishd
Diffstat (limited to 'fish_tests.cpp')
-rw-r--r--fish_tests.cpp32
1 files changed, 15 insertions, 17 deletions
diff --git a/fish_tests.cpp b/fish_tests.cpp
index aa9db117..b1061bbb 100644
--- a/fish_tests.cpp
+++ b/fish_tests.cpp
@@ -688,6 +688,9 @@ static void test_parser()
parser_t::principal_parser().eval(L"function recursive1 ; recursive2 ; end ; function recursive2 ; recursive1 ; end ; recursive1; ", io_chain_t(), TOP);
#endif
+ say(L"Testing empty function name");
+ parser_t::principal_parser().eval(L"function '' ; echo fail; exit 42 ; end ; ''", io_chain_t(), TOP);
+
say(L"Testing eval_args");
completion_list_t comps;
parser_t::principal_parser().expand_argument_list(L"alpha 'beta gamma' delta", comps);
@@ -1022,28 +1025,23 @@ static void test_wchar2utf8(const wchar_t *src, size_t slen, const char *dst, si
}
}
- do
+ size = wchar_to_utf8(src, slen, mem, dlen, flags);
+ if (res != size)
{
- size = wchar_to_utf8(src, slen, mem, dlen, flags);
- if (res != size)
- {
- err(L"w2u: %s: FAILED (rv: %lu, must be %lu)", descr, size, res);
- break;
- }
-
- if (mem == NULL)
- break; /* OK */
+ err(L"w2u: %s: FAILED (rv: %lu, must be %lu)", descr, size, res);
+ goto finish;
+ }
- if (memcmp(mem, dst, size) != 0)
- {
- err(L"w2u: %s: BROKEN", descr);
- break;
- }
+ if (mem == NULL)
+ goto finish; /* OK */
+ if (memcmp(mem, dst, size) != 0)
+ {
+ err(L"w2u: %s: BROKEN", descr);
+ goto finish;
}
- while (0);
- if (mem != NULL);
+ finish:
free(mem);
}