Skip to content

Commit 5b461c1

Browse files
committed
use /usr/bin/vi instead of /usr/share/dict/words as test input
/usr/bin/vi will be on any reasonable distro; words may not be.
1 parent 7ea1d2c commit 5b461c1

File tree

6 files changed

+9
-16
lines changed

6 files changed

+9
-16
lines changed

tests/Makefile.am

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ DISABLED_TESTS= \
3434
dispatch_read \
3535
dispatch_read2
3636

37-
# Tests that have been disabled until we can
38-
# fix them to pseudo-pass if expected input files
39-
# are not present on the testing system
40-
DISABLED_TESTS2= \
41-
dispatch_io \
42-
dispatch_io_net \
43-
dispatch_select
44-
45-
46-
4737
TESTS= \
4838
dispatch_apply \
4939
dispatch_api \
@@ -67,7 +57,10 @@ TESTS= \
6757
dispatch_starfish \
6858
dispatch_cascade \
6959
dispatch_drift \
70-
dispatch_data
60+
dispatch_data \
61+
dispatch_io \
62+
dispatch_io_net \
63+
dispatch_select
7164

7265
# List tests that are expected to fail here.
7366
# Currently dispatch_concur fails occasionally, but passes more often than fails.

tests/dispatch_io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ test_io_stop(void) // rdar://problem/8250057
238238
static void
239239
test_io_read_write(void)
240240
{
241-
const char *path_in = "/usr/share/dict/words";
241+
const char *path_in = "/usr/bin/vi";
242242
char path_out[] = "/tmp/dispatchtest_io.XXXXXX";
243243

244244
int in = open(path_in, O_RDONLY);

tests/dispatch_io_net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ main(int argc, char** argv)
6262
socklen_t addr1len;
6363
pid_t clientid;
6464

65-
const char *path = "/usr/share/dict/words";
65+
const char *path = "/usr/bin/vi";
6666
int read_fd, fd;
6767

6868
if (argc == 2) {

tests/dispatch_read.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ test_fin(void *cxt)
4545
int
4646
main(void)
4747
{
48-
const char *path = "/usr/share/dict/words";
48+
const char *path = "/usr/bin/vi";
4949
struct stat sb;
5050

5151
dispatch_test_start("Dispatch Source Read");

tests/dispatch_read2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ dispatch_read2(dispatch_fd_t fd,
118118
static void
119119
test_read(void)
120120
{
121-
const char *path = "/usr/share/dict/words";
121+
const char *path = "/usr/bin/vi";
122122
int fd = open(path, O_RDONLY);
123123
if (fd == -1) {
124124
test_errno("open", errno, 0);

tests/dispatch_select.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ stage1(int stage)
8484
void
8585
stage2(void)
8686
{
87-
const char *path = "/usr/share/dict/words";
87+
const char *path = "/usr/bin/vi";
8888
struct stat sb;
8989

9090
int fd = open(path, O_RDONLY);

0 commit comments

Comments
 (0)