![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 3300 for pjproject/trunk
- Timestamp:
- Aug 27, 2010 1:27:55 PM (14 years ago)
- Location:
- pjproject/trunk/tests/automated
- Files:
-
- 6 edited
-
configure.py (modified) (7 diffs)
-
gnu-ipp.xml.template (modified) (1 diff)
-
gnu.xml.template (modified) (1 diff)
-
msvc.xml.template (modified) (1 diff)
-
prepare.xml.template (modified) (1 diff)
-
testvars.template (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/tests/automated/configure.py
r3297 r3300 13 13 vs_target = "" 14 14 s60_target = "" 15 no_test = False 16 no_pjsua_test = False 15 17 16 18 # … … 124 126 125 127 def replace_vars(text): 126 global vs_target, s60_target, build_type 128 global vs_target, s60_target, build_type, no_test, no_pjsua_test 127 129 suffix = "" 128 130 … … 173 175 while True: 174 176 if text.find("$(PJSUA-TESTS)") >= 0: 175 # Determine pjsua exe to use 176 exe = "../../pjsip-apps/bin/pjsua-" + suffix 177 proc = subprocess.Popen(PYTHON + " runall.py --list-xml -e " + exe, 178 cwd="../pjsua", 179 shell=True, stdout=subprocess.PIPE) 180 content = proc.stdout.read() 177 if no_test==False and no_pjsua_test==False: 178 # Determine pjsua exe to use 179 exe = "../../pjsip-apps/bin/pjsua-" + suffix 180 proc = subprocess.Popen(PYTHON + " runall.py --list-xml -e " + exe, 181 cwd="../pjsua", 182 shell=True, stdout=subprocess.PIPE) 183 content = proc.stdout.read() 184 else: 185 content = "" 181 186 text = text.replace("$(PJSUA-TESTS)", content) 182 187 elif text.find("$(GCC)") >= 0: … … 228 233 cmd = "echo Success" 229 234 text = text.replace("$(NOP)", cmd) 235 elif text.find("$(NOTEST)") >= 0: 236 if no_test: 237 str = '"1"' 238 else: 239 str = '"0"' 240 text = text.replace("$(NOTEST)", str) 230 241 else: 231 242 break … … 234 245 235 246 def main(args): 236 global vs_target, s60_target, build_type 247 global vs_target, s60_target, build_type, no_test, no_pjsua_test 237 248 output = sys.stdout 238 249 usage = """Usage: configure.py [OPTIONS] scenario_template_file … … 256 267 - "gcce udeb" 257 268 - "gcce urel" 269 -notest Disable all tests in the scenario. 270 -nopjsuatest Disable pjsua tests in the scenario. 258 271 """ 259 272 … … 295 308 sys.stderr.write("Error: invalid -t argument value\n") 296 309 sys.exit(1) 310 elif args[0]=='-notest' or args[0]=='-notests': 311 args.pop(0) 312 no_test = True 313 elif args[0]=='-nopjsuatest' or args[0]=='-nopjsuatests': 314 args.pop(0) 315 no_pjsua_test = True 297 316 else: 298 317 break -
pjproject/trunk/tests/automated/gnu-ipp.xml.template
r3276 r3300 19 19 <Configure cmd='./aconfigure --enable-ipp --with-ipp="$(IPPROOT)" --with-ipp-samples="$(IPPSAMPLES)" --with-ipp-arch=$(IPPARCH)' /> 20 20 <Build cmd="make dep && make clean && make" /> 21 <Test name="pjlib-test" wdir="pjlib/bin" cmd="./pjlib-test-$(SUFFIX)" />22 <Test name="pjlib-util-test" wdir="pjlib-util/bin" cmd="./pjlib-util-test-$(SUFFIX)" />23 <Test name="pjnath-test" wdir="pjnath/bin" cmd="./pjnath-test-$(SUFFIX)" />24 <Test name="pjmedia-test" wdir="pjmedia/bin" cmd="./pjmedia-test-$(SUFFIX)" />25 <Test name="pjsip-test" wdir="pjsip/bin" cmd="./pjsip-test-$(SUFFIX)" />21 <Test name="pjlib-test" wdir="pjlib/bin" cmd="./pjlib-test-$(SUFFIX)" disabled=$(NOTEST) /> 22 <Test name="pjlib-util-test" wdir="pjlib-util/bin" cmd="./pjlib-util-test-$(SUFFIX)" disabled=$(NOTEST) /> 23 <Test name="pjnath-test" wdir="pjnath/bin" cmd="./pjnath-test-$(SUFFIX)" disabled=$(NOTEST) /> 24 <Test name="pjmedia-test" wdir="pjmedia/bin" cmd="./pjmedia-test-$(SUFFIX)" disabled=$(NOTEST) /> 25 <Test name="pjsip-test" wdir="pjsip/bin" cmd="./pjsip-test-$(SUFFIX)" disabled=$(NOTEST) /> 26 26 $(PJSUA-TESTS) 27 27 </Submit> -
pjproject/trunk/tests/automated/gnu.xml.template
r3276 r3300 19 19 <Configure cmd="./aconfigure" /> 20 20 <Build cmd="make dep && make clean && make" /> 21 <Test name="pjlib-test" wdir="pjlib/bin" cmd="./pjlib-test-$(SUFFIX)" />22 <Test name="pjlib-util-test" wdir="pjlib-util/bin" cmd="./pjlib-util-test-$(SUFFIX)" />23 <Test name="pjnath-test" wdir="pjnath/bin" cmd="./pjnath-test-$(SUFFIX)" />24 <Test name="pjmedia-test" wdir="pjmedia/bin" cmd="./pjmedia-test-$(SUFFIX)" />25 <Test name="pjsip-test" wdir="pjsip/bin" cmd="./pjsip-test-$(SUFFIX)" />21 <Test name="pjlib-test" wdir="pjlib/bin" cmd="./pjlib-test-$(SUFFIX)" disabled=$(NOTEST) /> 22 <Test name="pjlib-util-test" wdir="pjlib-util/bin" cmd="./pjlib-util-test-$(SUFFIX)" disabled=$(NOTEST) /> 23 <Test name="pjnath-test" wdir="pjnath/bin" cmd="./pjnath-test-$(SUFFIX)" disabled=$(NOTEST) /> 24 <Test name="pjmedia-test" wdir="pjmedia/bin" cmd="./pjmedia-test-$(SUFFIX)" disabled=$(NOTEST) /> 25 <Test name="pjsip-test" wdir="pjsip/bin" cmd="./pjsip-test-$(SUFFIX)" disabled=$(NOTEST) /> 26 26 $(PJSUA-TESTS) 27 27 </Submit> -
pjproject/trunk/tests/automated/msvc.xml.template
r3151 r3300 9 9 #define PJ_HAS_IPV6 1 10 10 #define PJMEDIA_HAS_G7221_CODEC 1 11 #define PJ_TODO(x) 11 12 ]]> 12 13 </FileWrite> 13 14 <Configure cmd="cmd /c echo success" /> 14 15 <Build cmd='vcbuild.exe /nologo /nohtmllog /nocolor /rebuild pjproject-vs8.sln "$(VSTARGET)|Win32"' /> 15 <Test name="pjlib-test" info="" wdir="pjlib/bin" cmd="pjlib-test-i386-Win32-vc8-$(VSTARGET)" />16 <Test name="pjlib-util-test" info="" wdir="pjlib-util/bin" cmd="pjlib-util-test-i386-Win32-vc8-$(VSTARGET)" />17 <Test name="pjnath-test" info="" wdir="pjnath/bin" cmd="pjnath-test-i386-Win32-vc8-$(VSTARGET)" />18 <Test name="pjmedia-test" info="" wdir="pjmedia/bin" cmd="pjmedia-test-i386-Win32-vc8-$(VSTARGET)" />19 <Test name="pjsip-test" info="" wdir="pjsip/bin" cmd="pjsip-test-i386-Win32-vc8-$(VSTARGET)" />16 <Test name="pjlib-test" info="" wdir="pjlib/bin" cmd="pjlib-test-i386-Win32-vc8-$(VSTARGET)" disabled=$(NOTEST)/> 17 <Test name="pjlib-util-test" info="" wdir="pjlib-util/bin" cmd="pjlib-util-test-i386-Win32-vc8-$(VSTARGET)" disabled=$(NOTEST) /> 18 <Test name="pjnath-test" info="" wdir="pjnath/bin" cmd="pjnath-test-i386-Win32-vc8-$(VSTARGET)" disabled=$(NOTEST) /> 19 <Test name="pjmedia-test" info="" wdir="pjmedia/bin" cmd="pjmedia-test-i386-Win32-vc8-$(VSTARGET)" disabled=$(NOTEST) /> 20 <Test name="pjsip-test" info="" wdir="pjsip/bin" cmd="pjsip-test-i386-Win32-vc8-$(VSTARGET)" disabled=$(NOTEST) /> 20 21 $(PJSUA-TESTS) 21 22 </Submit> -
pjproject/trunk/tests/automated/prepare.xml.template
r3294 r3300 28 28 <Test name="Configuring iPhone scenario" cmd="python configure.py -t gnu -o iphone.xml iphone.xml.template" /> 29 29 30 <!-- MSVC target. 31 Requirements: 32 - Build from VS successfully 33 - VS paths are set 34 35 --> 36 <Test name="Configuring Visual Studio for Win32" cmd="python configure.py -t vs -vstarget Release -o msvc-win32.xml -nopjsuatest msvc.xml.template" /> 37 30 38 <!-- Symbian target. 31 39 Requirement: -
pjproject/trunk/tests/automated/testvars.template
r3125 r3300 7 7 PJDIR = "$(PJDIR)" 8 8 SUFFIX = "$(SUFFIX)" 9 NOTEST = "$(NOTEST)" 9 10 10 11 S60 only: … … 12 13 S60TARGET = "$(S60TARGET)" 13 14 S60TARGETNAME = "$(S60TARGETNAME)" 15 S60DEVICE = "$(S60DEVICE)" 16 EPOCROOT = "$(EPOCROOT)" 14 17 15 18 VS only: … … 23 26 ------------------------------ 24 27 28 OTHER: 29 ------------------------------ 30 IPPROOT 31 IPPSAMPLES 32 IPPARCH 33 NOP (cmdline to do nothing)
Note: See TracChangeset
for help on using the changeset viewer.
