* [PATCH 1/3] Add make install recipe for alice only
@ 2018-07-24 9:09 Jonatan Schlag
2018-07-24 9:09 ` [PATCH 2/3] This recipe resets the network to a clean state Jonatan Schlag
2018-07-24 9:09 ` [PATCH 3/3] This recipe sets settings which are usually equal for each test Jonatan Schlag
0 siblings, 2 replies; 3+ messages in thread
From: Jonatan Schlag @ 2018-07-24 9:09 UTC (permalink / raw)
To: network
[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]
It saves us much time when we install the network only on alice, when we
are using alice only.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
Makefile.am | 9 ++++++---
test/nitsi/include/alice_make-install.in | 4 ++++
2 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 test/nitsi/include/alice_make-install.in
diff --git a/Makefile.am b/Makefile.am
index e56d0fb..bde49ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -586,13 +586,16 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \
https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/
NITSI_INCLUDE_RECIPES = \
- test/nitsi/include/make-install
+ test/nitsi/include/make-install \
+ test/nitsi/include/alice_make-install
EXTRA_DIST += \
- test/nitsi/include/make-install.in
+ test/nitsi/include/make-install.in \
+ test/nitsi/include/alice_make-install.in
CLEANFILES += \
- test/nitsi/include/make-install
+ test/nitsi/include/make-install \
+ test/nitsi/include/alice_make-install
NITSI_TESTS = \
test/nitsi/test/hello-world \
diff --git a/test/nitsi/include/alice_make-install.in b/test/nitsi/include/alice_make-install.in
new file mode 100644
index 0000000..6718510
--- /dev/null
+++ b/test/nitsi/include/alice_make-install.in
@@ -0,0 +1,4 @@
+alice: tar xvfa @PACKAGE_NAME(a)-@PACKAGE_VERSION(a).tar.gz && cd @PACKAGE_NAME(a)-@PACKAGE_VERSION@
+alice: ./configure --prefix=/usr && make -j2
+alice: make
+alice: make install
--
2.11.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/3] This recipe resets the network to a clean state
2018-07-24 9:09 [PATCH 1/3] Add make install recipe for alice only Jonatan Schlag
@ 2018-07-24 9:09 ` Jonatan Schlag
2018-07-24 9:09 ` [PATCH 3/3] This recipe sets settings which are usually equal for each test Jonatan Schlag
1 sibling, 0 replies; 3+ messages in thread
From: Jonatan Schlag @ 2018-07-24 9:09 UTC (permalink / raw)
To: network
[-- Attachment #1: Type: text/plain, Size: 1751 bytes --]
We using --force here to avoid the interactive y/n question.
This recipe is available in two version one for a setup with multiple
machines and one for a setup with alice only.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
Makefile.am | 8 ++++++--
test/nitsi/include/alice_network-reset | 1 +
test/nitsi/include/network-reset | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 test/nitsi/include/alice_network-reset
create mode 100644 test/nitsi/include/network-reset
diff --git a/Makefile.am b/Makefile.am
index bde49ff..66d2e8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -587,11 +587,15 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \
NITSI_INCLUDE_RECIPES = \
test/nitsi/include/make-install \
- test/nitsi/include/alice_make-install
+ test/nitsi/include/alice_make-install \
+ test/nitsi/include/alice_network-reset \
+ test/nitsi/include/network-reset
EXTRA_DIST += \
test/nitsi/include/make-install.in \
- test/nitsi/include/alice_make-install.in
+ test/nitsi/include/alice_make-install.in \
+ test/nitsi/include/alice_network-reset \
+ test/nitsi/include/network-reset
CLEANFILES += \
test/nitsi/include/make-install \
diff --git a/test/nitsi/include/alice_network-reset b/test/nitsi/include/alice_network-reset
new file mode 100644
index 0000000..cfb3bd5
--- /dev/null
+++ b/test/nitsi/include/alice_network-reset
@@ -0,0 +1 @@
+alice: network reset --force
diff --git a/test/nitsi/include/network-reset b/test/nitsi/include/network-reset
new file mode 100644
index 0000000..d82e2b1
--- /dev/null
+++ b/test/nitsi/include/network-reset
@@ -0,0 +1 @@
+all: network reset --force
--
2.11.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3/3] This recipe sets settings which are usually equal for each test
2018-07-24 9:09 [PATCH 1/3] Add make install recipe for alice only Jonatan Schlag
2018-07-24 9:09 ` [PATCH 2/3] This recipe resets the network to a clean state Jonatan Schlag
@ 2018-07-24 9:09 ` Jonatan Schlag
1 sibling, 0 replies; 3+ messages in thread
From: Jonatan Schlag @ 2018-07-24 9:09 UTC (permalink / raw)
To: network
[-- Attachment #1: Type: text/plain, Size: 2073 bytes --]
Some settings are equal for each test, so it is easier to write them
down once and include them then in every test.
We have two version here (all and alice) to avoid that bob is booted
when we are using only alice. (The all statement is substituded to
alice: and bob: so we have a command for bob and the machine is booted,
which costs time.)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
Makefile.am | 8 ++++++--
test/nitsi/include/alice_network-settings | 1 +
test/nitsi/include/network-settings | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 test/nitsi/include/alice_network-settings
create mode 100644 test/nitsi/include/network-settings
diff --git a/Makefile.am b/Makefile.am
index 66d2e8d..1f75ef3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -589,13 +589,17 @@ NITSI_INCLUDE_RECIPES = \
test/nitsi/include/make-install \
test/nitsi/include/alice_make-install \
test/nitsi/include/alice_network-reset \
- test/nitsi/include/network-reset
+ test/nitsi/include/network-reset \
+ test/nitsi/include/alice_network-settings \
+ test/nitsi/include/network-settings
EXTRA_DIST += \
test/nitsi/include/make-install.in \
test/nitsi/include/alice_make-install.in \
test/nitsi/include/alice_network-reset \
- test/nitsi/include/network-reset
+ test/nitsi/include/network-reset \
+ test/nitsi/include/alice_network-settings \
+ test/nitsi/include/network-settings
CLEANFILES += \
test/nitsi/include/make-install \
diff --git a/test/nitsi/include/alice_network-settings b/test/nitsi/include/alice_network-settings
new file mode 100644
index 0000000..1c071de
--- /dev/null
+++ b/test/nitsi/include/alice_network-settings
@@ -0,0 +1 @@
+alice: network settings DEBUG=1
diff --git a/test/nitsi/include/network-settings b/test/nitsi/include/network-settings
new file mode 100644
index 0000000..535fe4c
--- /dev/null
+++ b/test/nitsi/include/network-settings
@@ -0,0 +1 @@
+all: network settings DEBUG=1
--
2.11.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-24 9:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-24 9:09 [PATCH 1/3] Add make install recipe for alice only Jonatan Schlag
2018-07-24 9:09 ` [PATCH 2/3] This recipe resets the network to a clean state Jonatan Schlag
2018-07-24 9:09 ` [PATCH 3/3] This recipe sets settings which are usually equal for each test Jonatan Schlag
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox