[MERGED] osmo-gsm-tester[master]: put the example suite in /example, not /selftest/real_suite

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Thu May 4 20:55:56 UTC 2017


Neels Hofmeyr has submitted this change and it was merged.

Change subject: put the example suite in /example, not /selftest/real_suite
......................................................................


put the example suite in /example, not /selftest/real_suite

Also drop the env file and tweak the README.txt

Change-Id: Ieea274dfd6756498b760c18a5852398cfa396b50
---
A example/README.txt
R example/default-suites.conf
R example/defaults.conf
R example/paths.conf
R example/resources.conf
R example/scenarios/octphy.conf
R example/scenarios/sysmo.conf
R example/scenarios/trx.conf
R example/suites/sms/mo_mt_sms.py
R example/suites/sms/suite.conf
D selftest/real_suite/README.txt
D selftest/real_suite/env
12 files changed, 30 insertions(+), 22 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/example/README.txt b/example/README.txt
new file mode 100644
index 0000000..76567f2
--- /dev/null
+++ b/example/README.txt
@@ -0,0 +1,30 @@
+This a real gsm test suite configured and ready to use.
+The only thing missing is a trial dir containing binaries.
+
+You can point osmo-gsm-tester.py at this config using the OSMO_GSM_TESTER_CONF
+environment variable:
+
+    export OSMO_GSM_TESTER_CONF="$PWD"
+
+When there is no OSMO_GSM_TESTER_CONF set, osmo-gsm-tester will instead look
+for conf files in several locations like ~/.config/osmo-gsm-tester,
+/usr/local/etc/osmo-gsm-tester, /etc/osmo-gsm-tester.
+
+If you have your trial with binary tar archives in ~/my_trial
+you can run the suite for example like this:
+
+    osmo-gsm-tester.py ~/my_trial
+
+Specifically, from this dir:
+
+    OSMO_GSM_TESTER_CONF="$PWD" ../src/osmo-gsm-tester.py ~/my_trial
+
+Alternatively you can setup this example as permanent config using something
+like:
+
+    mkdir -p ~/.config
+    ln -s "$PWD" ~/.config/osmo-gsm-tester
+
+A ./state dir will be created to store the current osmo-gsm-tester state. If
+you prefer not to write to $PWD, set up an own configuration pointing at a
+different path (see paths.conf: 'state_dir').
diff --git a/selftest/real_suite/default-suites.conf b/example/default-suites.conf
similarity index 100%
rename from selftest/real_suite/default-suites.conf
rename to example/default-suites.conf
diff --git a/selftest/real_suite/defaults.conf b/example/defaults.conf
similarity index 100%
rename from selftest/real_suite/defaults.conf
rename to example/defaults.conf
diff --git a/selftest/real_suite/paths.conf b/example/paths.conf
similarity index 100%
rename from selftest/real_suite/paths.conf
rename to example/paths.conf
diff --git a/selftest/real_suite/resources.conf b/example/resources.conf
similarity index 100%
rename from selftest/real_suite/resources.conf
rename to example/resources.conf
diff --git a/selftest/real_suite/scenarios/octphy.conf b/example/scenarios/octphy.conf
similarity index 100%
rename from selftest/real_suite/scenarios/octphy.conf
rename to example/scenarios/octphy.conf
diff --git a/selftest/real_suite/scenarios/sysmo.conf b/example/scenarios/sysmo.conf
similarity index 100%
rename from selftest/real_suite/scenarios/sysmo.conf
rename to example/scenarios/sysmo.conf
diff --git a/selftest/real_suite/scenarios/trx.conf b/example/scenarios/trx.conf
similarity index 100%
rename from selftest/real_suite/scenarios/trx.conf
rename to example/scenarios/trx.conf
diff --git a/selftest/real_suite/suites/sms/mo_mt_sms.py b/example/suites/sms/mo_mt_sms.py
similarity index 100%
rename from selftest/real_suite/suites/sms/mo_mt_sms.py
rename to example/suites/sms/mo_mt_sms.py
diff --git a/selftest/real_suite/suites/sms/suite.conf b/example/suites/sms/suite.conf
similarity index 100%
rename from selftest/real_suite/suites/sms/suite.conf
rename to example/suites/sms/suite.conf
diff --git a/selftest/real_suite/README.txt b/selftest/real_suite/README.txt
deleted file mode 100644
index f18840a..0000000
--- a/selftest/real_suite/README.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-This a real gsm test suite configured and ready to use.
-The only thing missing is a trial dir containing binaries.
-
-If you have your trial with binary tar archives in ~/my_trial
-you can run the suite for example like this:
-
-    . ./env  # point your environment at all the right places
-    run_once.py ~/my_trial -s sms:trx
-
-This combines the suites/sms test suite with the scenarios/trx choice of
-osmo-bts-trx and runs all tests in the 'sms' suite.
-
-A ./state dir will be created to store the current osmo-gsm-tester state. If
-you prefer not to write to this dir, set up an own configuration pointing at a
-different path (see paths.conf: 'state_dir' and the env file).  When there is
-no OSMO_GSM_TESTER_CONF set (from ./env), osmo-gsm-tester will instead look for
-conf files in several locations like ~/.config/osmo-gsm-tester,
-/usr/local/etc/osmo-gsm-tester, /etc/osmo-gsm-tester
diff --git a/selftest/real_suite/env b/selftest/real_suite/env
deleted file mode 100644
index 1d9cc0a..0000000
--- a/selftest/real_suite/env
+++ /dev/null
@@ -1,4 +0,0 @@
-OSMO_GSM_TESTER_SRC="$(readlink -f ../../src)"
-export PYTHONPATH="$OSMO_GSM_TESTER_SRC"
-export PATH="$OSMO_GSM_TESTER_SRC:$PATH"
-export OSMO_GSM_TESTER_CONF="$PWD"

-- 
To view, visit https://gerrit.osmocom.org/2477
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieea274dfd6756498b760c18a5852398cfa396b50
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>



More information about the gerrit-log mailing list