Deleted Added
full compact
test_option_y.c (310569) test_option_y.c (318482)
1/*-
2 * Copyright (c) 2003-2007 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25#include "test.h"
1/*-
2 * Copyright (c) 2003-2007 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25#include "test.h"
26__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_y.c 310569 2016-12-26 06:16:27Z ngie $");
26__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_y.c 318482 2017-05-18 19:47:43Z mm $");
27
28DEFINE_TEST(test_option_y)
29{
30 char *p;
31 int r;
32 size_t s;
33
34 /* Create a file. */
35 assertMakeFile("f", 0644, "a");
36
37 /* Archive it with bzip2 compression. */
38 r = systemf("echo f | %s -oy >archive.out 2>archive.err",
39 testprog);
40 p = slurpfile(&s, "archive.err");
27
28DEFINE_TEST(test_option_y)
29{
30 char *p;
31 int r;
32 size_t s;
33
34 /* Create a file. */
35 assertMakeFile("f", 0644, "a");
36
37 /* Archive it with bzip2 compression. */
38 r = systemf("echo f | %s -oy >archive.out 2>archive.err",
39 testprog);
40 p = slurpfile(&s, "archive.err");
41 p[s] = '\0';
41 free(p);
42 if (r != 0) {
43 if (!canBzip2()) {
44 skipping("bzip2 is not supported on this platform");
45 return;
46 }
47 failure("-y option is broken");
48 assertEqualInt(r, 0);
42 if (r != 0) {
43 if (!canBzip2()) {
44 skipping("bzip2 is not supported on this platform");
45 return;
46 }
47 failure("-y option is broken");
48 assertEqualInt(r, 0);
49 goto done;
49 return;
50 }
51 assertTextFileContents("1 block\n", "archive.err");
52 /* Check that the archive file has a bzip2 signature. */
50 }
51 assertTextFileContents("1 block\n", "archive.err");
52 /* Check that the archive file has a bzip2 signature. */
53 free(p);
54 p = slurpfile(&s, "archive.out");
55 assert(s > 2);
56 assertEqualMem(p, "BZh9", 4);
53 p = slurpfile(&s, "archive.out");
54 assert(s > 2);
55 assertEqualMem(p, "BZh9", 4);
57done:
58 free(p);
59}
56 free(p);
57}