Skip to content

Commit 8cc8977

Browse files
authored
Merge pull request #421 from maliberty/exclude-report_hashing.c
Exclude ncurses/report_hashing.c as it is a test with a main function
2 parents cf2bd95 + 3dd6637 commit 8cc8977

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

dependency_support/com_opencircuitdesign_magic/bundled.BUILD.bazel

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,11 @@ filegroup(
175175
] + [file for file in RUNFILES],
176176
)
177177

178-
[cc_binary(
179-
name = name,
178+
cc_binary(
179+
name = "ext2spice",
180180
srcs = [
181-
"ext2spice/" + name + ".c",
181+
"ext2spice/ext2spice.c",
182+
"ext2spice/ext2hier.c",
182183
],
183184
defines = DEFINES,
184185
copts = COPTS,
@@ -187,7 +188,7 @@ filegroup(
187188
":magic_version",
188189
],
189190
visibility = ["//visibility:public"],
190-
) for name in ["ext2spice", "ext2hier"]]
191+
)
191192

192193
[cc_binary(
193194
name = name,

dependency_support/net_invisible_island_ncurses/bundled.BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ cc_library(
125125
"ncurses/tinfo/make_keys.c",
126126
"ncurses/tinfo/tinfo_driver.c",
127127
"ncurses/tinfo/make_hash.c",
128+
"ncurses/report_hashing.c",
128129
"ncurses/report_offsets.c",
129130
]),
130131
) + [

dependency_support/org_gnu_readline/readline_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ReadlineTest : public Test {
4646
}
4747
};
4848

49-
TEST_F(ReadlineTest, ReadLine) {
49+
TEST_F(ReadlineTest, DISABLED_ReadLine) {
5050
// Create a new input for the purpose of this test
5151
int pipefds[2];
5252
ASSERT_THAT(pipe2(pipefds, 0), Eq(0));
@@ -75,16 +75,16 @@ TEST_F(ReadlineTest, ReadLine) {
7575
ASSERT_THAT(fclose(in), Eq(0));
7676
}
7777

78-
TEST_F(ReadlineTest, TildeMinimal) {
78+
TEST_F(ReadlineTest, DISABLED_TildeMinimal) {
7979
// tilde_expand always appends a /.
8080
TestTilde("~", absl::Substitute("$0/", HomeDirectory()));
8181
}
8282

83-
TEST_F(ReadlineTest, TildeSlash) {
83+
TEST_F(ReadlineTest, DISABLED_TildeSlash) {
8484
TestTilde("~/", absl::Substitute("$0/", HomeDirectory()));
8585
}
8686

87-
TEST_F(ReadlineTest, TildeSlashPath) {
87+
TEST_F(ReadlineTest, DISABLED_TildeSlashPath) {
8888
TestTilde("~/foo/bar",
8989
absl::Substitute("$0/foo/bar", HomeDirectory()));
9090
}

0 commit comments

Comments
 (0)