From 3a8cc76a783cb1a92ddddbaaa8f66291c7a6d956 Mon Sep 17 00:00:00 2001 From: Adrien Kirjak <adrien.kirjak@ericsson.com> Date: Tue, 16 Jan 2018 13:03:23 +0100 Subject: [PATCH] Rewrote README-s and MAKEFILE-s with simplified cfg useage Signed-off-by: Adrien Kirjak <adrien.kirjak@ericsson.com> --- .../negative_tests/run_test_all | 4 ++-- .../positive_tests/Makefile | 2 +- .../positive_tests/README.txt | 21 ++++++++++++----- .../xml_tests/positive_tests/Makefile | 2 +- .../xml_tests/positive_tests/README.txt | 23 +++++++++++-------- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/conformance_test/core_language_tests/negative_tests/run_test_all b/conformance_test/core_language_tests/negative_tests/run_test_all index 25a6bbf24..629b23288 100755 --- a/conformance_test/core_language_tests/negative_tests/run_test_all +++ b/conformance_test/core_language_tests/negative_tests/run_test_all @@ -12,5 +12,5 @@ done echo "Batch execution of SA tests: creating 1 report for each script file" echo "You must have a symlink in this directory named perl and pointing to perl 5.6.0 or higher" -echo "./perl SAtester.pl $SCRIPTFLAGS -log SA_log.report *.script" -./perl SAtester.pl $SCRIPTFLAGS -log SA_log.report *.script +echo "./SAtester.pl $SCRIPTFLAGS -log SA_log.report *.script" +./SAtester.pl $SCRIPTFLAGS -log SA_log.report *.script diff --git a/conformance_test/core_language_tests/positive_tests/Makefile b/conformance_test/core_language_tests/positive_tests/Makefile index 02c3069b3..e67ad2d87 100644 --- a/conformance_test/core_language_tests/positive_tests/Makefile +++ b/conformance_test/core_language_tests/positive_tests/Makefile @@ -25,7 +25,7 @@ run: $(TTCN3_DIR)/bin/ttcn3_makefilegen -R -f -t pos_conf_tests.tpd && \ cd bin && \ $(MAKE) && \ - $(TTCN3_DIR)/bin/ttcn3_start pos_conf_tests pos_conf_tests.cfg && \ + $(TTCN3_DIR)/bin/ttcn3_start pos_conf_tests ../pos_conf_tests.cfg && \ cd .. clean: diff --git a/conformance_test/core_language_tests/positive_tests/README.txt b/conformance_test/core_language_tests/positive_tests/README.txt index 49636fc93..54a7c2eb4 100644 --- a/conformance_test/core_language_tests/positive_tests/README.txt +++ b/conformance_test/core_language_tests/positive_tests/README.txt @@ -1,11 +1,20 @@ // README to positive conformance tests How to run: -1. Generate a Makefile from pos_conf_test.tpd in positive_tests folder: - ttcn3_makefilegen -f -t pos_conf_tests.tpd -2. Compile Makefile in bin folder: + +A. (Makefile) + 1. Build and run tests using Makefile in positive tests folder: + make + 2. Clean everything in bin folder: + make clean + + +B. (Without the Makefile) + 1. Generate a Makefile from pos_conf_test.tpd in positive_tests folder: + ttcn3_makefilegen -R -f -t pos_conf_tests.tpd + 2. Compile Makefile in bin folder: make -3. Run tests in bin folder: - ttcn3_start pos_conf_tests -4. Clean everything in bin folder: + 3. Run tests in bin folder: + ttcn3_start pos_conf_tests ../pos_conf_tests.cfg + 4. Clean everything in bin folder: make clean diff --git a/conformance_test/xml_tests/positive_tests/Makefile b/conformance_test/xml_tests/positive_tests/Makefile index ab5b7ed1e..b78cc2686 100644 --- a/conformance_test/xml_tests/positive_tests/Makefile +++ b/conformance_test/xml_tests/positive_tests/Makefile @@ -25,7 +25,7 @@ run: $(TTCN3_DIR)/bin/ttcn3_makefilegen -f -t XML_tests.tpd && \ cd bin && \ $(MAKE) && \ - $(TTCN3_DIR)/bin/ttcn3_start XML_tests XML_tests.cfg && \ + $(TTCN3_DIR)/bin/ttcn3_start XML_tests ../XML_tests.cfg && \ cd .. clean: diff --git a/conformance_test/xml_tests/positive_tests/README.txt b/conformance_test/xml_tests/positive_tests/README.txt index 623b03797..649dae4ab 100644 --- a/conformance_test/xml_tests/positive_tests/README.txt +++ b/conformance_test/xml_tests/positive_tests/README.txt @@ -1,17 +1,20 @@ // README to positive xml conformance tests How to run: -A. -1. Create bin folder in positive_tests and copy XML_tests.cfg into it -2. Use the Makefile in positive tests folder - + +A. (Makefile) + 1. Build and run tests using Makefile in positive tests folder: + make + 2. Clean everything in bin folder: + make clean + + B. (Without the Makefile) -1. Generate a Makefile from XML_tests.tpd in positive_tests folder: + 1. Generate a Makefile from XML_tests.tpd in positive_tests folder: ttcn3_makefilegen -f -t XML_tests.tpd -2. Create bin folder in positive_tests and copy XML_tests.cfg into it -3. Compile Makefile in bin folder: + 2. Compile Makefile in bin folder: make -4. Run tests in bin folder: - ttcn3_start XML_tests XML_tests.cfg -5. Clean everything in bin folder: + 3. Run tests in bin folder: + ttcn3_start XML_tests ../XML_tests.cfg + 4. Clean everything in bin folder: make clean -- GitLab