ttcn3-bts-test: replace subnets during 'make cfg'
Make ttcn3-bts-test work as expected again by replacing the subnets hardcoded in the confmerge files and Makefile. Related: OS#5802 Change-Id: I733619f80b4e2456da070649634d3c942bb6d95f
This commit is contained in:
parent
2437f4fe8e
commit
f71e0f2856
|
@ -270,10 +270,13 @@ network_replace_subnet_in_configs() {
|
||||||
"$VOL_BASE_DIR" \
|
"$VOL_BASE_DIR" \
|
||||||
-name '*.cfg' -o \
|
-name '*.cfg' -o \
|
||||||
-name '*.conf' -o \
|
-name '*.conf' -o \
|
||||||
|
-name '*.confmerge' -o \
|
||||||
|
-name '*.inc' -o \
|
||||||
-name '*.scm' -o \
|
-name '*.scm' -o \
|
||||||
-name '*.sh' -o \
|
-name '*.sh' -o \
|
||||||
-name '*.txt' -o \
|
-name '*.txt' -o \
|
||||||
-name '*.yaml' \
|
-name '*.yaml' -o \
|
||||||
|
-name 'Makefile' \
|
||||||
)"
|
)"
|
||||||
|
|
||||||
if [ -z "$files" ]; then
|
if [ -z "$files" ]; then
|
||||||
|
|
|
@ -140,7 +140,9 @@ cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \
|
||||||
$VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc
|
$VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc
|
||||||
|
|
||||||
# (re)generate the configuration files
|
# (re)generate the configuration files
|
||||||
make cfg
|
cp Makefile $VOL_BASE_DIR/Makefile
|
||||||
|
network_replace_subnet_in_configs
|
||||||
|
make -f $VOL_BASE_DIR/Makefile cfg
|
||||||
|
|
||||||
mkdir $VOL_BASE_DIR/bsc
|
mkdir $VOL_BASE_DIR/bsc
|
||||||
cp generic/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
|
cp generic/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
|
||||||
|
|
Loading…
Reference in New Issue