aboutsummaryrefslogtreecommitdiff
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
-rw-r--r--cache.c13
-rwxr-xr-xtests/t0020-validate-cache.sh8
2 files changed, 7 insertions, 14 deletions
diff --git a/cache.c b/cache.c
index aa870e3..74a1795 100644
--- a/cache.c
+++ b/cache.c
@@ -15,7 +15,6 @@
#include "cgit.h"
#include "cache.h"
-#include "html.h"
#define CACHE_BUFSIZE (1024 * 4)
@@ -405,12 +404,12 @@ int cache_ls(const char *path)
fullname.buf, strerror(err), err);
continue;
}
- htmlf("%s %s %10"PRIuMAX" %s\n",
- fullname.buf,
- sprintftime("%Y-%m-%d %H:%M:%S",
- slot.cache_st.st_mtime),
- (uintmax_t)slot.cache_st.st_size,
- slot.buf);
+ printf("%s %s %10"PRIuMAX" %s\n",
+ fullname.buf,
+ sprintftime("%Y-%m-%d %H:%M:%S",
+ slot.cache_st.st_mtime),
+ (uintmax_t)slot.cache_st.st_size,
+ slot.buf);
close_slot(&slot);
}
closedir(dir);
diff --git a/tests/t0020-validate-cache.sh b/tests/t0020-validate-cache.sh
index 657765d..7e7379a 100755
--- a/tests/t0020-validate-cache.sh
+++ b/tests/t0020-validate-cache.sh
@@ -66,13 +66,7 @@ test_expect_success 'verify cache-size=1021' '
cgit_url "bar/diff" &&
cgit_url "bar/patch" &&
ls cache >output &&
- test_line_count = 13 output &&
- cgit_url "foo/ls_cache" >output.full &&
- strip_headers <output.full >output &&
- test_line_count = 13 output &&
- # Check that ls_cache output is cached correctly
- cgit_url "foo/ls_cache" >output.second &&
- test_cmp output.full output.second
+ test_line_count = 13 output
'
test_done