From a4cd7f88ae6ba6cac4784bea03a7ec47abe8c764 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Thu, 20 Jul 2017 17:57:37 +0200
Subject: fix make distcheck with python tests

- bscs.config needed by the vty tests was not picked up as a dist file, because
  its suffix is not 'cfg'. Rename to *.cfg. Apply this rename in
  vty_test_runner.py and osmo-bsc_nat.cfg.
- Remove restart counters after external tests, otherwise distcheck complains
  about uncleaned files.
- Add contrib/ipa.py to EXTRA_DIST, hence add a Makefile.am to contrib/.
  Otherwise the python tests cannot find that dependency.

Change-Id: I42b55cb1125099afc3a8e3f87c0e398426b2e2a9
---
 doc/examples/osmo-bsc_nat/bscs.cfg         | 13 +++++++++++++
 doc/examples/osmo-bsc_nat/bscs.config      | 13 -------------
 doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 doc/examples/osmo-bsc_nat/bscs.cfg
 delete mode 100644 doc/examples/osmo-bsc_nat/bscs.config

(limited to 'doc')

diff --git a/doc/examples/osmo-bsc_nat/bscs.cfg b/doc/examples/osmo-bsc_nat/bscs.cfg
new file mode 100644
index 000000000..176debe42
--- /dev/null
+++ b/doc/examples/osmo-bsc_nat/bscs.cfg
@@ -0,0 +1,13 @@
+nat
+ bsc 0
+  token lol
+  location_area_code 1234
+  description bsc
+  max-endpoints 32
+  paging forbidden 0
+ bsc 1
+  token wat
+  location_area_code 5678
+  description bsc
+  max-endpoints 32
+  paging forbidden 0
diff --git a/doc/examples/osmo-bsc_nat/bscs.config b/doc/examples/osmo-bsc_nat/bscs.config
deleted file mode 100644
index 176debe42..000000000
--- a/doc/examples/osmo-bsc_nat/bscs.config
+++ /dev/null
@@ -1,13 +0,0 @@
-nat
- bsc 0
-  token lol
-  location_area_code 1234
-  description bsc
-  max-endpoints 32
-  paging forbidden 0
- bsc 1
-  token wat
-  location_area_code 5678
-  description bsc
-  max-endpoints 32
-  paging forbidden 0
diff --git a/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg b/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
index 6b48e970e..e835e068a 100644
--- a/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
+++ b/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
@@ -62,5 +62,5 @@ nat
  timeout ping 20
  timeout pong 5
  ip-dscp 0
- bscs-config-file bscs.config
+ bscs-config-file bscs.cfg
  access-list bla imsi-allow ^11$
-- 
cgit v1.2.3