From c95a79457dfe3e46051dcc602d5ccf30897c09d7 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Sun, 21 Feb 2010 15:16:10 +0000 Subject: [PATCH] Split the "live rpcgen" sub-test into its own test script. git-svn-id: http://scons.tigris.org/svn/scons/trunk@4681 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- test/Rpcgen/RPCGEN.py | 71 -------------------------- test/Rpcgen/live.py | 114 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 71 deletions(-) create mode 100644 test/Rpcgen/live.py diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py index e8a7a1ff..5fde5dff 100644 --- a/test/Rpcgen/RPCGEN.py +++ b/test/Rpcgen/RPCGEN.py @@ -24,8 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import sys - import TestSCons _python_ = TestSCons._python_ @@ -78,75 +76,6 @@ test.must_match('rpcif_xdr.c', expect_xdr) -rpcgen = test.where_is('rpcgen') -if rpcgen: - - test.subdir('do_rpcgen') - - test.write('SConstruct', """\ -import os -env = Environment(ENV=os.environ) -env.Program('rpcclnt', ['rpcclnt.c', 'do_rpcgen/rpcif_clnt.c']) -env.RPCGenHeader('do_rpcgen/rpcif') -env.RPCGenClient('do_rpcgen/rpcif') -env.RPCGenService('do_rpcgen/rpcif') -env.RPCGenXDR('do_rpcgen/rpcif') -""") - - test.write(['do_rpcgen', 'rpcif.x'], """\ -program RPCTEST_IF -{ - version RPCTEST_IF_VERSION - { - int START(unsigned long) = 1; - int STOP(unsigned long) = 2; - int STATUS(unsigned long) = 3; - } = 1; /* version */ -} = 0xfeedf00d; /* portmap program ID */ -""") - -# Following test tries to make sure it can compile and link, but when -# it's run it doesn't actually invoke any rpc operations because that -# would have significant dependencies on network configuration, -# portmapper, etc. that aren't necessarily appropriate for an scons -# test. - - test.write('rpcclnt.c', """\ -#include -#include -#include "do_rpcgen/rpcif.h" - -int main(int argc, char **args) { - const char* const SERVER = "localhost"; - CLIENT *cl; - int *rslt; - unsigned long arg = 0; - if (argc > 2) { - cl = clnt_create( SERVER, RPCTEST_IF, RPCTEST_IF_VERSION, "udp" ); - if (cl == 0 ) { return 1; } - rslt = start_1(&arg, cl); - if (*rslt == 0) { clnt_perror( cl, SERVER ); return 1; } - clnt_destroy(cl); - } else - printf("Hello!\\n"); - return 0; -} -""") - - - # OX X through 10.5 include an ancient version of rpcgen from 1998 that - # generates numerous compile warnings. Ignore stderr for this platform. - if sys.platform[:6] == 'darwin': - test.run(stderr=None) - else: - test.run() - - test.run(program=test.workpath('rpcclnt'+_exe)) - - test.fail_test(not test.stdout() in ["Hello!\n", "Hello!\r\n"]) - - - test.pass_test() # Local Variables: diff --git a/test/Rpcgen/live.py b/test/Rpcgen/live.py new file mode 100644 index 00000000..6f238ff8 --- /dev/null +++ b/test/Rpcgen/live.py @@ -0,0 +1,114 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Verifies correct use of a live rpcgen command. +""" + +import TestSCons + +_python_ = TestSCons._python_ +_exe = TestSCons._exe + +test = TestSCons.TestSCons() + +rpcgen = test.where_is('rpcgen') +if not rpcgen: + test.skip_test('Can not find installed "rpcgen", skipping test.\n') + +test.subdir('do_rpcgen') + +test.write('SConstruct', """\ +import os +env = Environment(ENV=os.environ) +if env['PLATFORM'] == 'darwin': + # The generated rpcif_clnt.c file uses memset() without the necessary + # #include to get the declarations right. Suppress the + # warnings so the test passes. + env.Append(CCFLAGS=['-w']) +env.Program('rpcclnt', ['rpcclnt.c', 'do_rpcgen/rpcif_clnt.c']) +env.RPCGenHeader('do_rpcgen/rpcif') +env.RPCGenClient('do_rpcgen/rpcif') +env.RPCGenService('do_rpcgen/rpcif') +env.RPCGenXDR('do_rpcgen/rpcif') +""") + +test.write(['do_rpcgen', 'rpcif.x'], """\ +program RPCTEST_IF +{ + version RPCTEST_IF_VERSION + { + int START(unsigned long) = 1; + int STOP(unsigned long) = 2; + int STATUS(unsigned long) = 3; + } = 1; /* version */ +} = 0xfeedf00d; /* portmap program ID */ +""") + +# Following test tries to make sure it can compile and link, but when +# it's run it doesn't actually invoke any rpc operations because that +# would have significant dependencies on network configuration, +# portmapper, etc. that aren't necessarily appropriate for an scons +# test. + +test.write('rpcclnt.c', """\ +#include +#include +#include "do_rpcgen/rpcif.h" + +int main(int argc, char **args) { + const char* const SERVER = "localhost"; + CLIENT *cl; + int *rslt; + unsigned long arg = 0; + if (argc > 2) { + cl = clnt_create( SERVER, RPCTEST_IF, RPCTEST_IF_VERSION, "udp" ); + if (cl == 0 ) { return 1; } + rslt = start_1(&arg, cl); + if (*rslt == 0) { clnt_perror( cl, SERVER ); return 1; } + clnt_destroy(cl); + } else + printf("Hello!\\n"); + return 0; +} +""") + + +test.run() + +test.run(program=test.workpath('rpcclnt'+_exe)) + +test.fail_test(not test.stdout() in ["Hello!\n", "Hello!\r\n"]) + + + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: -- 2.26.2