diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5dab2685..40d2e9a2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,18 +47,22 @@ jobs: Xvfb :99 & sleep 3 openbox & - cargo test --manifest-path relm-examples/Cargo.toml -- --nocapture + cargo test -- --nocapture - name: "relm-derive: tests" run: | cargo test --manifest-path relm-derive/Cargo.toml -- --nocapture - - name: "relm: test examples" + - name: "relm-examples: tests" run: | Xvfb :99 & sleep 3 openbox & - cargo test --manifest-path relm-examples/Cargo.toml --examples + cargo test --manifest-path relm-examples/Cargo.toml -- --nocapture + + - name: "relm-test: tests" + run: | + cargo test --manifest-path relm-test/Cargo.toml -- --nocapture - name: "relm: test buttons-attribute example" run: | diff --git a/.gitignore b/.gitignore index d96c183e..0f3ff491 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -target +/target Cargo.lock release.sh diff --git a/Cargo.toml b/Cargo.toml index bb99ab0d..382b757e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,5 +21,24 @@ gtk = "^0.14.0" libc = "^0.2.54" log = "^0.4.6" +[dev-dependencies] +relm-derive = { path = "relm-derive" } + [features] hidpi = [] + +[workspace] +members = [ + ".", + "relm-derive", + "relm-examples", + "relm-examples/examples/7gui/*", + "relm-test", + + # The following must be listed manually instead of "relm-examples/examples/*" + # because of rust-lang/cargo#6745. + "relm-examples/examples/async", + "relm-examples/examples/buttons-attribute", + "relm-examples/examples/http", + "relm-examples/examples/webkit-test", +] diff --git a/relm-examples/tests/include.rs b/relm-examples/tests/include.rs index acaadfbb..fd277a40 100644 --- a/relm-examples/tests/include.rs +++ b/relm-examples/tests/include.rs @@ -64,7 +64,7 @@ impl Widget for Win { } // Specify a view written in another file. - view!("tests/buttons.relm"); + view!("relm-examples/tests/buttons.relm"); } fn main() { diff --git a/src/lib.rs b/src/lib.rs index 0fc888bb..05d77b72 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -240,9 +240,13 @@ type InitTestComponents = (Component, ::St /// # impl WidgetTest for Win { /// # type Widgets = Win; /// # +/// # type Streams = (); +/// # /// # fn get_widgets(&self) -> Self::Widgets { /// # self.clone() /// # } +/// # +/// # fn get_streams(&self) -> Self::Streams {} /// # } /// # /// # impl Widget for Win {