Deleted Added
full compact
test_basic.c (348608) test_basic.c (358090)
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/10/contrib/libarchive/tar/test/test_basic.c 348608 2019-06-04 10:36:26Z mm $");
26__FBSDID("$FreeBSD: stable/10/contrib/libarchive/tar/test/test_basic.c 358090 2020-02-19 01:51:44Z mm $");
27
28static const char *
29make_files(void)
30{
31 FILE *f;
32
33 /* File with 10 bytes content. */
34 f = fopen("file", "wb");

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

91 const char *unpack_options, const char *flist)
92{
93 int r;
94
95 assertMakeDir(target, 0775);
96
97 /* Use the tar program to create an archive. */
98 r = systemf("%s cf - %s %s >%s/archive 2>%s/pack.err", testprog, pack_options, flist, target, target);
27
28static const char *
29make_files(void)
30{
31 FILE *f;
32
33 /* File with 10 bytes content. */
34 f = fopen("file", "wb");

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

91 const char *unpack_options, const char *flist)
92{
93 int r;
94
95 assertMakeDir(target, 0775);
96
97 /* Use the tar program to create an archive. */
98 r = systemf("%s cf - %s %s >%s/archive 2>%s/pack.err", testprog, pack_options, flist, target, target);
99 failure("Error invoking %s cf -", testprog, pack_options);
99 failure("Error invoking %s cf -%s", testprog, pack_options);
100 assertEqualInt(r, 0);
101
102 assertChdir(target);
103
104 /* Verify that nothing went to stderr. */
105 assertEmptyFile("pack.err");
106
107 /*

--- 28 unchanged lines hidden ---
100 assertEqualInt(r, 0);
101
102 assertChdir(target);
103
104 /* Verify that nothing went to stderr. */
105 assertEmptyFile("pack.err");
106
107 /*

--- 28 unchanged lines hidden ---