aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/integration-tests/Makefile.am4
-rw-r--r--src/pt/test_gns_vpn.c2
-rw-r--r--src/pt/test_gns_vpn.conf2
4 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 6099acc3f..ecffcf0c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Wed 03 Apr 2019 01:15:57 PM CEST
2 Fixed a few test case regressions (GNS, FS). -CG
3
1Mon Apr 1 22:00:00 UTC 2019 4Mon Apr 1 22:00:00 UTC 2019
2 documentation/buildsystem: manpages and other documentation parts 5 documentation/buildsystem: manpages and other documentation parts
3 can now be build more controlled again, this fixes the regression 6 can now be build more controlled again, this fixes the regression
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 368980064..26dd4f92d 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -20,8 +20,8 @@ check_SCRIPTS = \
20 test_integration_disconnect.py \ 20 test_integration_disconnect.py \
21 test_integration_disconnect_nat.py \ 21 test_integration_disconnect_nat.py \
22 test_integration_reconnect.py \ 22 test_integration_reconnect.py \
23 test_integration_reconnect_nat.py \ 23 test_integration_reconnect_nat.py
24 test_integration_clique.py 24# test_integration_clique.py
25endif 25endif
26 26
27 27
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 05fab18be..069277a00 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -11,7 +11,7 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index 85dd08113..9277aa3c3 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -7,8 +7,6 @@ PLUGINS = tcp
7[arm] 7[arm]
8PORT = 0 8PORT = 0
9ALLOW_SHUTDOWN = YES 9ALLOW_SHUTDOWN = YES
10START_SYSTEM_SERVICES = NO
11START_USER_SERVICES = NO
12 10
13[exit] 11[exit]
14IMMEDIATE_START = YES 12IMMEDIATE_START = YES