[svn:parrot] r39981 - in branches/tt761_keys_revamp: . compilers/imcc compilers/pct/src/PAST config/auto config/gen config/gen/config_h config/gen/makefiles config/gen/platform/generic config/gen/platform/win32 docs docs/dev editor examples/library include/parrot lib/Parrot lib/Parrot/Configure/Options lib/Parrot/Configure/Options/Conf lib/Parrot/Configure/Options/Test lib/Parrot/Configure/Step lib/Parrot/IO runtime/parrot/library runtime/parrot/library/PGE src src/call src/dynoplibs src/gc src/io src/ops src/pmc src/runcore t/codingstd t/configure t/dynoplibs t/op t/pmc t/steps t/steps/auto t/steps/gen t/steps/init t/steps/init/hints t/steps/inter t/tools/install t/tools/ops2cutils t/tools/ops2pm tools/dev
bacek at svn.parrot.org
bacek at svn.parrot.org
Fri Jul 10 22:11:19 UTC 2009
Author: bacek
Date: Fri Jul 10 22:11:09 2009
New Revision: 39981
URL: https://trac.parrot.org/parrot/changeset/39981
Log:
Bring branch up-to-date with trunk.
Added:
branches/tt761_keys_revamp/config/auto/thread.pm
branches/tt761_keys_revamp/config/gen/config_h/has_header_h.in
branches/tt761_keys_revamp/src/dynoplibs/obscure.ops
- copied, changed from r39980, branches/tt761_keys_revamp/src/ops/obscure.ops
branches/tt761_keys_revamp/t/configure/049-options_test_prepare.t
branches/tt761_keys_revamp/t/steps/auto/
branches/tt761_keys_revamp/t/steps/auto/alignptrs-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_alignptrs-01.t
branches/tt761_keys_revamp/t/steps/auto/alignptrs-02.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_alignptrs-02.t
branches/tt761_keys_revamp/t/steps/auto/arch-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_arch-01.t
branches/tt761_keys_revamp/t/steps/auto/attributes-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_attributes-01.t
branches/tt761_keys_revamp/t/steps/auto/backtrace-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_backtrace-01.t
branches/tt761_keys_revamp/t/steps/auto/byteorder-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_byteorder-01.t
branches/tt761_keys_revamp/t/steps/auto/cgoto-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_cgoto-01.t
branches/tt761_keys_revamp/t/steps/auto/cpu-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_cpu-01.t
branches/tt761_keys_revamp/t/steps/auto/crypto-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_crypto-01.t
branches/tt761_keys_revamp/t/steps/auto/ctags-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_ctags-01.t
branches/tt761_keys_revamp/t/steps/auto/env-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_env-01.t
branches/tt761_keys_revamp/t/steps/auto/fink-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_fink-01.t
branches/tt761_keys_revamp/t/steps/auto/format-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_format-01.t
branches/tt761_keys_revamp/t/steps/auto/funcptr-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_funcptr-01.t
branches/tt761_keys_revamp/t/steps/auto/gc-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_gc-01.t
branches/tt761_keys_revamp/t/steps/auto/gcc-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_gcc-01.t
branches/tt761_keys_revamp/t/steps/auto/gdbm-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_gdbm-01.t
branches/tt761_keys_revamp/t/steps/auto/gettext-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_gettext-01.t
branches/tt761_keys_revamp/t/steps/auto/glibc-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_glibc-01.t
branches/tt761_keys_revamp/t/steps/auto/gmp-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_gmp-01.t
branches/tt761_keys_revamp/t/steps/auto/headers-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_headers-01.t
branches/tt761_keys_revamp/t/steps/auto/icu-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_icu-01.t
branches/tt761_keys_revamp/t/steps/auto/inline-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_inline-01.t
branches/tt761_keys_revamp/t/steps/auto/isreg-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_isreg-01.t
branches/tt761_keys_revamp/t/steps/auto/jit-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_jit-01.t
branches/tt761_keys_revamp/t/steps/auto/macports-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_macports-01.t
branches/tt761_keys_revamp/t/steps/auto/macports-02.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_macports-02.t
branches/tt761_keys_revamp/t/steps/auto/memalign-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_memalign-01.t
branches/tt761_keys_revamp/t/steps/auto/msvc-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_msvc-01.t
branches/tt761_keys_revamp/t/steps/auto/neg_0-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_neg_0-01.t
branches/tt761_keys_revamp/t/steps/auto/opengl-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_opengl-01.t
branches/tt761_keys_revamp/t/steps/auto/ops-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_ops-01.t
branches/tt761_keys_revamp/t/steps/auto/pcre-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_pcre-01.t
branches/tt761_keys_revamp/t/steps/auto/perldoc-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_perldoc-01.t
branches/tt761_keys_revamp/t/steps/auto/pmc-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_pmc-01.t
branches/tt761_keys_revamp/t/steps/auto/pod2man-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_pod2man-01.t
branches/tt761_keys_revamp/t/steps/auto/readline-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_readline-01.t
branches/tt761_keys_revamp/t/steps/auto/readline-02.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_readline-02.t
branches/tt761_keys_revamp/t/steps/auto/revision-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_revision-01.t
branches/tt761_keys_revamp/t/steps/auto/signal-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_signal-01.t
branches/tt761_keys_revamp/t/steps/auto/sizes-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_sizes-01.t
branches/tt761_keys_revamp/t/steps/auto/snprintf-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_snprintf-01.t
branches/tt761_keys_revamp/t/steps/auto/socklen_t-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_socklen_t-01.t
branches/tt761_keys_revamp/t/steps/auto/thread-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_crypto-01.t
branches/tt761_keys_revamp/t/steps/auto/va_ptr-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_va_ptr-01.t
branches/tt761_keys_revamp/t/steps/auto/warnings-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/auto_warnings-01.t
branches/tt761_keys_revamp/t/steps/gen/
branches/tt761_keys_revamp/t/steps/gen/call_list-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_call_list-01.t
branches/tt761_keys_revamp/t/steps/gen/config_h-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_config_h-01.t
branches/tt761_keys_revamp/t/steps/gen/config_pm-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_config_pm-01.t
branches/tt761_keys_revamp/t/steps/gen/core_pmcs-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_core_pmcs-01.t
branches/tt761_keys_revamp/t/steps/gen/crypto-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_crypto-01.t
branches/tt761_keys_revamp/t/steps/gen/makefiles-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_makefiles-01.t
branches/tt761_keys_revamp/t/steps/gen/opengl-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_opengl-01.t
branches/tt761_keys_revamp/t/steps/gen/parrot_include-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_parrot_include-01.t
branches/tt761_keys_revamp/t/steps/gen/platform-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/gen_platform-01.t
branches/tt761_keys_revamp/t/steps/init/
branches/tt761_keys_revamp/t/steps/init/defaults-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/init_defaults-01.t
branches/tt761_keys_revamp/t/steps/init/headers-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/init_headers-01.t
branches/tt761_keys_revamp/t/steps/init/hints/
branches/tt761_keys_revamp/t/steps/init/hints-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/init_hints-01.t
branches/tt761_keys_revamp/t/steps/init/hints/darwin-01.t
branches/tt761_keys_revamp/t/steps/init/install-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/init_install-01.t
branches/tt761_keys_revamp/t/steps/init/manifest-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/init_manifest-01.t
branches/tt761_keys_revamp/t/steps/init/optimize-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/init_optimize-01.t
branches/tt761_keys_revamp/t/steps/inter/
branches/tt761_keys_revamp/t/steps/inter/charset-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_charset-01.t
branches/tt761_keys_revamp/t/steps/inter/encoding-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_encoding-01.t
branches/tt761_keys_revamp/t/steps/inter/lex-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_lex-01.t
branches/tt761_keys_revamp/t/steps/inter/lex-02.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_lex-02.t
branches/tt761_keys_revamp/t/steps/inter/lex-03.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_lex-03.t
branches/tt761_keys_revamp/t/steps/inter/libparrot-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_libparrot-01.t
branches/tt761_keys_revamp/t/steps/inter/make-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_make-01.t
branches/tt761_keys_revamp/t/steps/inter/progs-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_progs-01.t
branches/tt761_keys_revamp/t/steps/inter/progs-02.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_progs-02.t
branches/tt761_keys_revamp/t/steps/inter/progs-03.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_progs-03.t
branches/tt761_keys_revamp/t/steps/inter/progs-04.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_progs-04.t
branches/tt761_keys_revamp/t/steps/inter/shlibs-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_shlibs-01.t
branches/tt761_keys_revamp/t/steps/inter/types-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_types-01.t
branches/tt761_keys_revamp/t/steps/inter/yacc-01.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_yacc-01.t
branches/tt761_keys_revamp/t/steps/inter/yacc-02.t
- copied, changed from r39980, branches/tt761_keys_revamp/t/steps/inter_yacc-02.t
Deleted:
branches/tt761_keys_revamp/src/dynoplibs/myops.ops
branches/tt761_keys_revamp/src/ops/obscure.ops
branches/tt761_keys_revamp/t/configure/049-options_test.t
branches/tt761_keys_revamp/t/dynoplibs/myops.t
branches/tt761_keys_revamp/t/steps/auto_alignptrs-01.t
branches/tt761_keys_revamp/t/steps/auto_alignptrs-02.t
branches/tt761_keys_revamp/t/steps/auto_arch-01.t
branches/tt761_keys_revamp/t/steps/auto_attributes-01.t
branches/tt761_keys_revamp/t/steps/auto_backtrace-01.t
branches/tt761_keys_revamp/t/steps/auto_byteorder-01.t
branches/tt761_keys_revamp/t/steps/auto_cgoto-01.t
branches/tt761_keys_revamp/t/steps/auto_cpu-01.t
branches/tt761_keys_revamp/t/steps/auto_crypto-01.t
branches/tt761_keys_revamp/t/steps/auto_ctags-01.t
branches/tt761_keys_revamp/t/steps/auto_env-01.t
branches/tt761_keys_revamp/t/steps/auto_fink-01.t
branches/tt761_keys_revamp/t/steps/auto_format-01.t
branches/tt761_keys_revamp/t/steps/auto_funcptr-01.t
branches/tt761_keys_revamp/t/steps/auto_gc-01.t
branches/tt761_keys_revamp/t/steps/auto_gcc-01.t
branches/tt761_keys_revamp/t/steps/auto_gdbm-01.t
branches/tt761_keys_revamp/t/steps/auto_gettext-01.t
branches/tt761_keys_revamp/t/steps/auto_glibc-01.t
branches/tt761_keys_revamp/t/steps/auto_gmp-01.t
branches/tt761_keys_revamp/t/steps/auto_headers-01.t
branches/tt761_keys_revamp/t/steps/auto_icu-01.t
branches/tt761_keys_revamp/t/steps/auto_inline-01.t
branches/tt761_keys_revamp/t/steps/auto_isreg-01.t
branches/tt761_keys_revamp/t/steps/auto_jit-01.t
branches/tt761_keys_revamp/t/steps/auto_macports-01.t
branches/tt761_keys_revamp/t/steps/auto_macports-02.t
branches/tt761_keys_revamp/t/steps/auto_memalign-01.t
branches/tt761_keys_revamp/t/steps/auto_msvc-01.t
branches/tt761_keys_revamp/t/steps/auto_neg_0-01.t
branches/tt761_keys_revamp/t/steps/auto_opengl-01.t
branches/tt761_keys_revamp/t/steps/auto_ops-01.t
branches/tt761_keys_revamp/t/steps/auto_pcre-01.t
branches/tt761_keys_revamp/t/steps/auto_perldoc-01.t
branches/tt761_keys_revamp/t/steps/auto_pmc-01.t
branches/tt761_keys_revamp/t/steps/auto_pod2man-01.t
branches/tt761_keys_revamp/t/steps/auto_readline-01.t
branches/tt761_keys_revamp/t/steps/auto_readline-02.t
branches/tt761_keys_revamp/t/steps/auto_revision-01.t
branches/tt761_keys_revamp/t/steps/auto_signal-01.t
branches/tt761_keys_revamp/t/steps/auto_sizes-01.t
branches/tt761_keys_revamp/t/steps/auto_snprintf-01.t
branches/tt761_keys_revamp/t/steps/auto_socklen_t-01.t
branches/tt761_keys_revamp/t/steps/auto_va_ptr-01.t
branches/tt761_keys_revamp/t/steps/auto_warnings-01.t
branches/tt761_keys_revamp/t/steps/gen_call_list-01.t
branches/tt761_keys_revamp/t/steps/gen_config_h-01.t
branches/tt761_keys_revamp/t/steps/gen_config_pm-01.t
branches/tt761_keys_revamp/t/steps/gen_core_pmcs-01.t
branches/tt761_keys_revamp/t/steps/gen_crypto-01.t
branches/tt761_keys_revamp/t/steps/gen_makefiles-01.t
branches/tt761_keys_revamp/t/steps/gen_opengl-01.t
branches/tt761_keys_revamp/t/steps/gen_parrot_include-01.t
branches/tt761_keys_revamp/t/steps/gen_platform-01.t
branches/tt761_keys_revamp/t/steps/init_defaults-01.t
branches/tt761_keys_revamp/t/steps/init_headers-01.t
branches/tt761_keys_revamp/t/steps/init_hints-01.t
branches/tt761_keys_revamp/t/steps/init_install-01.t
branches/tt761_keys_revamp/t/steps/init_manifest-01.t
branches/tt761_keys_revamp/t/steps/init_optimize-01.t
branches/tt761_keys_revamp/t/steps/inter_charset-01.t
branches/tt761_keys_revamp/t/steps/inter_encoding-01.t
branches/tt761_keys_revamp/t/steps/inter_lex-01.t
branches/tt761_keys_revamp/t/steps/inter_lex-02.t
branches/tt761_keys_revamp/t/steps/inter_lex-03.t
branches/tt761_keys_revamp/t/steps/inter_libparrot-01.t
branches/tt761_keys_revamp/t/steps/inter_make-01.t
branches/tt761_keys_revamp/t/steps/inter_progs-01.t
branches/tt761_keys_revamp/t/steps/inter_progs-02.t
branches/tt761_keys_revamp/t/steps/inter_progs-03.t
branches/tt761_keys_revamp/t/steps/inter_progs-04.t
branches/tt761_keys_revamp/t/steps/inter_shlibs-01.t
branches/tt761_keys_revamp/t/steps/inter_types-01.t
branches/tt761_keys_revamp/t/steps/inter_yacc-01.t
branches/tt761_keys_revamp/t/steps/inter_yacc-02.t
Modified:
branches/tt761_keys_revamp/CREDITS
branches/tt761_keys_revamp/DEPRECATED.pod
branches/tt761_keys_revamp/MANIFEST
branches/tt761_keys_revamp/compilers/imcc/reg_alloc.c
branches/tt761_keys_revamp/compilers/pct/src/PAST/Compiler.pir
branches/tt761_keys_revamp/compilers/pct/src/PAST/Node.pir
branches/tt761_keys_revamp/config/auto/gettext.pm
branches/tt761_keys_revamp/config/gen/config_h.pm
branches/tt761_keys_revamp/config/gen/makefiles/dynoplibs.in
branches/tt761_keys_revamp/config/gen/platform/generic/threads.h
branches/tt761_keys_revamp/config/gen/platform/win32/dl.c
branches/tt761_keys_revamp/config/gen/platform/win32/env.c
branches/tt761_keys_revamp/config/gen/platform/win32/exec.c
branches/tt761_keys_revamp/config/gen/platform/win32/threads.h
branches/tt761_keys_revamp/docs/compiler_faq.pod
branches/tt761_keys_revamp/docs/dev/events.pod
branches/tt761_keys_revamp/editor/skeleton.pir
branches/tt761_keys_revamp/examples/library/ncurses_life.pir
branches/tt761_keys_revamp/include/parrot/atomic.h
branches/tt761_keys_revamp/include/parrot/interpreter.h
branches/tt761_keys_revamp/include/parrot/io.h
branches/tt761_keys_revamp/include/parrot/list.h
branches/tt761_keys_revamp/include/parrot/parrot.h
branches/tt761_keys_revamp/include/parrot/thr_pthread.h
branches/tt761_keys_revamp/include/parrot/thr_windows.h
branches/tt761_keys_revamp/include/parrot/thread.h
branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Conf.pm
branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Conf/Shared.pm
branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Test/Prepare.pm
branches/tt761_keys_revamp/lib/Parrot/Configure/Step/List.pm
branches/tt761_keys_revamp/lib/Parrot/Distribution.pm
branches/tt761_keys_revamp/lib/Parrot/IO/Directory.pm
branches/tt761_keys_revamp/lib/Parrot/IO/Path.pm
branches/tt761_keys_revamp/lib/Parrot/Ops2pm.pm
branches/tt761_keys_revamp/lib/Parrot/OpsFile.pm
branches/tt761_keys_revamp/lib/Parrot/Test.pm
branches/tt761_keys_revamp/runtime/parrot/library/P6object.pir
branches/tt761_keys_revamp/runtime/parrot/library/PGE/Perl6Grammar.pir
branches/tt761_keys_revamp/src/call/ops.c
branches/tt761_keys_revamp/src/call/pcc.c
branches/tt761_keys_revamp/src/events.c
branches/tt761_keys_revamp/src/exceptions.c
branches/tt761_keys_revamp/src/gc/api.c
branches/tt761_keys_revamp/src/hash.c
branches/tt761_keys_revamp/src/io/socket_api.c
branches/tt761_keys_revamp/src/io/socket_unix.c
branches/tt761_keys_revamp/src/io/unix.c
branches/tt761_keys_revamp/src/library.c
branches/tt761_keys_revamp/src/list.c
branches/tt761_keys_revamp/src/pmc/class.pmc
branches/tt761_keys_revamp/src/pmc/exceptionhandler.pmc
branches/tt761_keys_revamp/src/pmc/sub.pmc
branches/tt761_keys_revamp/src/runcore/trace.c
branches/tt761_keys_revamp/src/scheduler.c
branches/tt761_keys_revamp/src/spf_render.c
branches/tt761_keys_revamp/t/codingstd/c_indent.t
branches/tt761_keys_revamp/t/codingstd/test_file_coverage.t
branches/tt761_keys_revamp/t/configure/017-revision_from_cache.t
branches/tt761_keys_revamp/t/configure/018-revision_to_cache.t
branches/tt761_keys_revamp/t/configure/061-revision_from_cache.t
branches/tt761_keys_revamp/t/op/cc_state.t
branches/tt761_keys_revamp/t/pmc/threads.t
branches/tt761_keys_revamp/t/pmc/timer.t
branches/tt761_keys_revamp/t/tools/install/01-create_directories.t
branches/tt761_keys_revamp/t/tools/install/dev_overall.t
branches/tt761_keys_revamp/t/tools/install/overall.t
branches/tt761_keys_revamp/t/tools/ops2cutils/06-dynamic.t
branches/tt761_keys_revamp/t/tools/ops2cutils/09-dynamic_nolines.t
branches/tt761_keys_revamp/t/tools/ops2pm/05-renum_op_map_file.t
branches/tt761_keys_revamp/t/tools/ops2pm/10-print_module.t
branches/tt761_keys_revamp/t/tools/ops2pm/11-print_h.t
branches/tt761_keys_revamp/tools/dev/create_language.pl
branches/tt761_keys_revamp/tools/dev/mk_language_shell.pl
Modified: branches/tt761_keys_revamp/CREDITS
==============================================================================
--- branches/tt761_keys_revamp/CREDITS Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/CREDITS Fri Jul 10 22:11:09 2009 (r39981)
@@ -485,6 +485,7 @@
E: jesse at fsck.com
N: Jimmy Zhuo
+A: jimmy
E: zhuomingliang at yahoo.com.cn
D: Bugfixes
Modified: branches/tt761_keys_revamp/DEPRECATED.pod
==============================================================================
--- branches/tt761_keys_revamp/DEPRECATED.pod Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/DEPRECATED.pod Fri Jul 10 22:11:09 2009 (r39981)
@@ -87,7 +87,7 @@
=item moved to dynop [eligible in 1.1]
-Parts or all of: bit.ops, debug.ops, io.ops, math.ops, obscure.ops, set.ops
+Parts or all of: bit.ops, debug.ops, io.ops, math.ops, set.ops
(the obscure and rarely used parts), sys.ops.
L<https://trac.parrot.org/parrot/ticket/449>
@@ -96,10 +96,6 @@
F<src/ops/experimental.ops> - only the C<trap> opcode remains
-=item myops [eligible in 1.1]
-
-L<https://trac.parrot.org/parrot/ticket/450>
-
=item get_addr and set_addr [eligible in 1.5]
L<https://trac.parrot.org/parrot/ticket/218>
Modified: branches/tt761_keys_revamp/MANIFEST
==============================================================================
--- branches/tt761_keys_revamp/MANIFEST Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/MANIFEST Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Thu Jul 2 17:10:26 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Fri Jul 10 06:43:50 2009 UT
#
# See below for documentation on the format of this file.
#
@@ -289,6 +289,7 @@
config/auto/snprintf.pm []
config/auto/snprintf/test_c.in []
config/auto/socklen_t.pm []
+config/auto/thread.pm []
config/auto/va_ptr.pm []
config/auto/va_ptr/test_c.in []
config/auto/warnings.pm []
@@ -299,6 +300,7 @@
config/gen/config_h.pm []
config/gen/config_h/config_h.in []
config/gen/config_h/feature_h.in []
+config/gen/config_h/has_header_h.in []
config/gen/config_pm.pm []
config/gen/config_pm/Config_pm.in []
config/gen/config_pm/config_lib_pasm.in []
@@ -1246,7 +1248,7 @@
src/debug.c []
src/dynext.c []
src/dynoplibs/README []doc
-src/dynoplibs/myops.ops []
+src/dynoplibs/obscure.ops []
src/dynpmc/README.pod []doc
src/dynpmc/dynlexpad.pmc [devel]src
src/dynpmc/ext.pir []
@@ -1358,7 +1360,6 @@
src/ops/io.ops []
src/ops/math.ops []
src/ops/object.ops []
-src/ops/obscure.ops []
src/ops/ops.num [devel]src
src/ops/ops.skip []
src/ops/pic.ops []
@@ -1643,7 +1644,7 @@
t/configure/046-inter.t [test]
t/configure/047-inter.t [test]
t/configure/048-return_result_undef.t [test]
-t/configure/049-options_test.t [test]
+t/configure/049-options_test_prepare.t [test]
t/configure/050-fatal.t [test]
t/configure/051-fatal_step.t [test]
t/configure/059-silent.t [test]
@@ -1670,7 +1671,6 @@
t/distro/file_metadata.t [test]
t/distro/manifest.t [test]
t/distro/meta_yml.t [test]
-t/dynoplibs/myops.t [test]
t/dynpmc/dynlexpad.t [test]
t/dynpmc/foo.t [test]
t/dynpmc/gdbmhash.t [test]
@@ -1937,81 +1937,83 @@
t/src/exit.t [test]
t/src/extend.t [test]
t/src/warnings.t [test]
-t/steps/auto_alignptrs-01.t [test]
-t/steps/auto_alignptrs-02.t [test]
-t/steps/auto_arch-01.t [test]
-t/steps/auto_attributes-01.t [test]
-t/steps/auto_backtrace-01.t [test]
-t/steps/auto_byteorder-01.t [test]
-t/steps/auto_cgoto-01.t [test]
-t/steps/auto_cpu-01.t [test]
-t/steps/auto_crypto-01.t [test]
-t/steps/auto_ctags-01.t [test]
-t/steps/auto_env-01.t [test]
-t/steps/auto_fink-01.t [test]
-t/steps/auto_format-01.t [test]
-t/steps/auto_funcptr-01.t [test]
-t/steps/auto_gc-01.t [test]
-t/steps/auto_gcc-01.t [test]
-t/steps/auto_gdbm-01.t [test]
-t/steps/auto_gettext-01.t [test]
-t/steps/auto_glibc-01.t [test]
-t/steps/auto_gmp-01.t [test]
-t/steps/auto_headers-01.t [test]
-t/steps/auto_icu-01.t [test]
-t/steps/auto_inline-01.t [test]
-t/steps/auto_isreg-01.t [test]
-t/steps/auto_jit-01.t [test]
-t/steps/auto_macports-01.t [test]
-t/steps/auto_macports-02.t [test]
-t/steps/auto_memalign-01.t [test]
-t/steps/auto_msvc-01.t [test]
-t/steps/auto_neg_0-01.t [test]
-t/steps/auto_opengl-01.t [test]
-t/steps/auto_ops-01.t [test]
-t/steps/auto_pcre-01.t [test]
-t/steps/auto_perldoc-01.t [test]
-t/steps/auto_pmc-01.t [test]
-t/steps/auto_pod2man-01.t [test]
-t/steps/auto_readline-01.t [test]
-t/steps/auto_readline-02.t [test]
-t/steps/auto_revision-01.t [test]
-t/steps/auto_signal-01.t [test]
-t/steps/auto_sizes-01.t [test]
-t/steps/auto_snprintf-01.t [test]
-t/steps/auto_socklen_t-01.t [test]
-t/steps/auto_va_ptr-01.t [test]
-t/steps/auto_warnings-01.t [test]
-t/steps/gen_call_list-01.t [test]
-t/steps/gen_config_h-01.t [test]
-t/steps/gen_config_pm-01.t [test]
-t/steps/gen_core_pmcs-01.t [test]
-t/steps/gen_crypto-01.t [test]
-t/steps/gen_makefiles-01.t [test]
-t/steps/gen_opengl-01.t [test]
-t/steps/gen_parrot_include-01.t [test]
-t/steps/gen_platform-01.t [test]
-t/steps/init_defaults-01.t [test]
-t/steps/init_headers-01.t [test]
-t/steps/init_hints-01.t [test]
-t/steps/init_install-01.t [test]
-t/steps/init_manifest-01.t [test]
-t/steps/init_optimize-01.t [test]
-t/steps/inter_charset-01.t [test]
-t/steps/inter_encoding-01.t [test]
-t/steps/inter_lex-01.t [test]
-t/steps/inter_lex-02.t [test]
-t/steps/inter_lex-03.t [test]
-t/steps/inter_libparrot-01.t [test]
-t/steps/inter_make-01.t [test]
-t/steps/inter_progs-01.t [test]
-t/steps/inter_progs-02.t [test]
-t/steps/inter_progs-03.t [test]
-t/steps/inter_progs-04.t [test]
-t/steps/inter_shlibs-01.t [test]
-t/steps/inter_types-01.t [test]
-t/steps/inter_yacc-01.t [test]
-t/steps/inter_yacc-02.t [test]
+t/steps/auto/alignptrs-01.t [test]
+t/steps/auto/alignptrs-02.t [test]
+t/steps/auto/arch-01.t [test]
+t/steps/auto/attributes-01.t [test]
+t/steps/auto/backtrace-01.t [test]
+t/steps/auto/byteorder-01.t [test]
+t/steps/auto/cgoto-01.t [test]
+t/steps/auto/cpu-01.t [test]
+t/steps/auto/crypto-01.t [test]
+t/steps/auto/ctags-01.t [test]
+t/steps/auto/env-01.t [test]
+t/steps/auto/fink-01.t [test]
+t/steps/auto/format-01.t [test]
+t/steps/auto/funcptr-01.t [test]
+t/steps/auto/gc-01.t [test]
+t/steps/auto/gcc-01.t [test]
+t/steps/auto/gdbm-01.t [test]
+t/steps/auto/gettext-01.t [test]
+t/steps/auto/glibc-01.t [test]
+t/steps/auto/gmp-01.t [test]
+t/steps/auto/headers-01.t [test]
+t/steps/auto/icu-01.t [test]
+t/steps/auto/inline-01.t [test]
+t/steps/auto/isreg-01.t [test]
+t/steps/auto/jit-01.t [test]
+t/steps/auto/macports-01.t [test]
+t/steps/auto/macports-02.t [test]
+t/steps/auto/memalign-01.t [test]
+t/steps/auto/msvc-01.t [test]
+t/steps/auto/neg_0-01.t [test]
+t/steps/auto/opengl-01.t [test]
+t/steps/auto/ops-01.t [test]
+t/steps/auto/pcre-01.t [test]
+t/steps/auto/perldoc-01.t [test]
+t/steps/auto/pmc-01.t [test]
+t/steps/auto/pod2man-01.t [test]
+t/steps/auto/readline-01.t [test]
+t/steps/auto/readline-02.t [test]
+t/steps/auto/revision-01.t [test]
+t/steps/auto/signal-01.t [test]
+t/steps/auto/sizes-01.t [test]
+t/steps/auto/snprintf-01.t [test]
+t/steps/auto/socklen_t-01.t [test]
+t/steps/auto/thread-01.t [test]
+t/steps/auto/va_ptr-01.t [test]
+t/steps/auto/warnings-01.t [test]
+t/steps/gen/call_list-01.t [test]
+t/steps/gen/config_h-01.t [test]
+t/steps/gen/config_pm-01.t [test]
+t/steps/gen/core_pmcs-01.t [test]
+t/steps/gen/crypto-01.t [test]
+t/steps/gen/makefiles-01.t [test]
+t/steps/gen/opengl-01.t [test]
+t/steps/gen/parrot_include-01.t [test]
+t/steps/gen/platform-01.t [test]
+t/steps/init/defaults-01.t [test]
+t/steps/init/headers-01.t [test]
+t/steps/init/hints-01.t [test]
+t/steps/init/hints/darwin-01.t [test]
+t/steps/init/install-01.t [test]
+t/steps/init/manifest-01.t [test]
+t/steps/init/optimize-01.t [test]
+t/steps/inter/charset-01.t [test]
+t/steps/inter/encoding-01.t [test]
+t/steps/inter/lex-01.t [test]
+t/steps/inter/lex-02.t [test]
+t/steps/inter/lex-03.t [test]
+t/steps/inter/libparrot-01.t [test]
+t/steps/inter/make-01.t [test]
+t/steps/inter/progs-01.t [test]
+t/steps/inter/progs-02.t [test]
+t/steps/inter/progs-03.t [test]
+t/steps/inter/progs-04.t [test]
+t/steps/inter/shlibs-01.t [test]
+t/steps/inter/types-01.t [test]
+t/steps/inter/yacc-01.t [test]
+t/steps/inter/yacc-02.t [test]
t/stress/gc.t [test]
t/tools/dev/pmctree.t [test]
t/tools/dev/searchops.t [test]
Modified: branches/tt761_keys_revamp/compilers/imcc/reg_alloc.c
==============================================================================
--- branches/tt761_keys_revamp/compilers/imcc/reg_alloc.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/compilers/imcc/reg_alloc.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -158,8 +158,7 @@
__attribute__nonnull__(1)
FUNC_MODIFIES(*unit);
-PARROT_WARN_UNUSED_RESULT
-static int try_allocate(PARROT_INTERP, ARGIN(IMC_Unit *unit))
+static void try_allocate(PARROT_INTERP, ARGIN(IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -1013,7 +1012,7 @@
/*
-=item C<static int try_allocate(PARROT_INTERP, IMC_Unit *unit)>
+=item C<static void try_allocate(PARROT_INTERP, IMC_Unit *unit)>
Color the graph, assigning registers to each symbol:
@@ -1026,8 +1025,7 @@
*/
-PARROT_WARN_UNUSED_RESULT
-static int
+static void
try_allocate(PARROT_INTERP, ARGIN(IMC_Unit *unit))
{
ASSERT_ARGS(try_allocate)
@@ -1043,7 +1041,7 @@
n = unit->max_color + 1;
if (!n)
- return -1;
+ return;
avail = mem_allocate_n_typed(n, char);
@@ -1073,9 +1071,11 @@
map_colors(unit, i, graph, avail, r->set, already_allocated);
color = ig_find_color(unit, avail);
- if (color == -1)
+ if (color == -1) {
+ mem_sys_free(avail);
IMCC_fatal(interp, DEBUG_IMC,
"# no more colors - this should not happen\n");
+ }
color += already_allocated;
r->color = color;
@@ -1085,7 +1085,7 @@
}
mem_sys_free(avail);
- return -1; /* we are totally finished */
+ /* we are totally finished */
}
/*
Modified: branches/tt761_keys_revamp/compilers/pct/src/PAST/Compiler.pir
==============================================================================
--- branches/tt761_keys_revamp/compilers/pct/src/PAST/Compiler.pir Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/compilers/pct/src/PAST/Compiler.pir Fri Jul 10 22:11:09 2009 (r39981)
@@ -2224,20 +2224,21 @@
.param pmc node
.param pmc bindpost
- .local string name
+ .local pmc ops
$P0 = get_hll_global ['POST'], 'Ops'
+ ops = $P0.'new'('node'=>node)
+ .local string name
name = node.'name'()
name = self.'escape'(name)
- .local pmc call_on, ops
+ .local pmc call_on
call_on = node[0]
if null call_on goto use_self
call_on = self.'as_post'(call_on, 'rtype'=>'P')
- ops = call_on
+ ops.'push'(call_on)
goto invocant_done
use_self:
call_on = box 'self'
- ops = $P0.'new'('node'=>node)
invocant_done:
if bindpost goto attribute_bind
Modified: branches/tt761_keys_revamp/compilers/pct/src/PAST/Node.pir
==============================================================================
--- branches/tt761_keys_revamp/compilers/pct/src/PAST/Node.pir Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/compilers/pct/src/PAST/Node.pir Fri Jul 10 22:11:09 2009 (r39981)
@@ -162,7 +162,7 @@
unless value goto normal
die "Unable to set lvalue on PAST::Val node"
normal:
- .tailcall self.'attr'('value', value, has_value)
+ .tailcall self.'attr'('lvalue', value, has_value)
.end
=back
Modified: branches/tt761_keys_revamp/config/auto/gettext.pm
==============================================================================
--- branches/tt761_keys_revamp/config/auto/gettext.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/config/auto/gettext.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -62,8 +62,9 @@
} );
# On OS X check the presence of the gettext header in the standard
- # Fink location.
+ # Fink and MacPorts locations.
$self->_handle_darwin_for_fink($conf, $osname, 'libintl.h');
+ $self->_handle_darwin_for_macports($conf, $osname, 'libintl.h');
$conf->cc_gen('config/auto/gettext/gettext_c.in');
eval { $conf->cc_build( q{}, $extra_libs ); };
Added: branches/tt761_keys_revamp/config/auto/thread.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/tt761_keys_revamp/config/auto/thread.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -0,0 +1,67 @@
+# Copyright (C) 2009, Parrot Foundation.
+# $Id$
+
+=head1 NAME
+
+config/auto/thread.pm - Thread support
+
+=head1 DESCRIPTION
+
+Determining if the system has a Thread support.
+
+=cut
+
+package auto::thread;
+
+use strict;
+use warnings;
+
+use base qw(Parrot::Configure::Step);
+
+use Parrot::Configure::Utils ':auto';
+
+sub _init {
+ my $self = shift;
+ my %data;
+ $data{description} = q{Does your system has thread};
+ $data{result} = q{};
+ return \%data;
+}
+
+sub runstep {
+ my ( $self, $conf ) = @_;
+
+ my ( $verbose, $without ) = $conf->options->get(
+ qw|
+ verbose
+ without-threads
+ |
+ );
+
+ if ($without) {
+ $conf->data->set( HAS_THREADS => 0 );
+ $self->set_result('no');
+ return 1;
+ }
+
+ if ($conf->data->get_p5('OSNAME') eq 'MSWin32'
+ || $conf->data->get('i_pthread') eq 'define') {
+ $conf->data->set( HAS_THREADS => 1 );
+ $self->set_result('yes');
+ }
+ else {
+ $conf->data->set( HAS_THREADS => 0 );
+ $self->set_result('no');
+ }
+
+ return 1;
+}
+
+1;
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: branches/tt761_keys_revamp/config/gen/config_h.pm
==============================================================================
--- branches/tt761_keys_revamp/config/gen/config_h.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/config/gen/config_h.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -30,8 +30,9 @@
$data{description} = q{Generate C headers};
$data{result} = q{};
$data{templates} = {
- config_h => 'config/gen/config_h/config_h.in',
- feature_h => 'config/gen/config_h/feature_h.in',
+ config_h => 'config/gen/config_h/config_h.in',
+ feature_h => 'config/gen/config_h/feature_h.in',
+ has_header_h => 'config/gen/config_h/has_header_h.in',
};
return \%data;
}
@@ -49,107 +50,34 @@
feature_file => 1
);
- my $hh = "include/parrot/has_header.h";
- $conf->append_configure_log($hh);
- open( my $HH, ">", "$hh.tmp" )
- or die "Can't open has_header.h: $!";
-
- print {$HH} <<EOF;
-/*
-** !!!!!!! DO NOT EDIT THIS FILE !!!!!!!
-**
-** This file is generated automatically by Configure.pl
-*/
-
-#ifndef PARROT_HAS_HEADER_H_GUARD
-#define PARROT_HAS_HEADER_H_GUARD
-
-/*
- * i_(\\w+) header includes
- */
-
-EOF
-
- for ( sort( $conf->data->keys() ) ) {
- next unless /i_(\w+)/;
- if ( $conf->data->get($_) ) {
- print {$HH} "#define PARROT_HAS_HEADER_\U$1 1\n";
- }
- else {
- print {$HH} "#undef PARROT_HAS_HEADER_\U$1\n";
- }
- }
-
- my $osname = $conf->data->get_p5('OSNAME');
- print {$HH} "\n#define BUILD_OS_NAME \"$osname\"\n";
-
- _handle_define_option($conf, $HH);
-
- print {$HH} <<EOF;
-
-/*
- * HAS_(\\w+) config entries
- */
-
-EOF
- for ( sort( $conf->data->keys() ) ) {
- next unless /HAS_(\w+)/;
- if ( $conf->data->get($_) ) {
- print {$HH} "#define PARROT_HAS_\U$1 1\n";
- }
- }
- print {$HH} <<EOF;
-
-/*
- * D_(\\w+) config entries
- */
-
-EOF
- for ( sort( $conf->data->keys() ) ) {
- next unless /D_(\w+)/;
- my $val;
- if ( $val = $conf->data->get($_) ) {
- print {$HH} "#define PARROT_\U$1 $val\n";
- }
- }
-
- # append the guard endif and C code coda
- print {$HH} <<EOF;
-
-#endif /* PARROT_HAS_HEADER_H_GUARD */
-
-/*
- * Local variables:
- * c-file-style: "parrot"
- * End:
- * vim: expandtab shiftwidth=4:
- */
-EOF
+ $conf->data->set( TEMP_header =>
+ join "\n", map { $conf->data->get($_)
+ ? "#define PARROT_HAS_HEADER_" . uc(substr $_, 2) . " 1"
+ : "#undef PARROT_HAS_HEADER_" . uc(substr $_, 2) }
+ grep { /^i_\w+/ }
+ sort $conf->data->keys()
+ );
- close $HH;
+ $conf->data->set( TEMP_has_config =>
+ join "\n", map { "#define PARROT_" . uc($_) . " 1" }
+ grep { /^HAS_\w+/ && $conf->data->get($_) }
+ sort $conf->data->keys()
+ );
- move_if_diff( "$hh.tmp", $hh );
+ $conf->data->set( TEMP_d_config =>
+ join "\n", map { "#define PARROT_" . uc(substr $_, 2) . " " . $conf->data->get($_) }
+ grep { /^D_\w+/ }
+ sort $conf->data->keys()
+ );
- return 1;
-}
+ $conf->data->set( TEMP_cli_define =>
+ join "\n", map { "#define PARROT_DEF_" . uc($_) . " 1" }
+ split /,/, $conf->options->get('define') || ''
+ );
-sub _handle_define_option {
- my ($conf, $HH) = @_;
- my $define = $conf->options->get('define');
-
- if ($define) {
- my @vals = split /,/, $define;
- print {$HH} <<EOF;
-
-/*
- * defines from commandline
- */
-
-EOF
- for my $v (@vals) {
- print {$HH} "#define PARROT_DEF_" . uc($v), " 1\n";
- }
- }
+ $conf->genfile($self->{templates}->{has_header_h}, 'include/parrot/has_header.h');
+
+ return 1;
}
1;
Added: branches/tt761_keys_revamp/config/gen/config_h/has_header_h.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/tt761_keys_revamp/config/gen/config_h/has_header_h.in Fri Jul 10 22:11:09 2009 (r39981)
@@ -0,0 +1,41 @@
+/* Copyright (C) 2009, Parrot Foundation.
+ * $Id$
+ */
+
+#ifndef PARROT_HAS_HEADER_H_GUARD
+#define PARROT_HAS_HEADER_H_GUARD
+
+/*
+ * i_\w+ header includes
+ */
+
+ at TEMP_header@
+
+#define BUILD_OS_NAME "@osname@"
+
+/*
+ * defines from commandline
+ */
+
+ at TEMP_cli_define@
+
+/*
+ * HAS_\w+ config entries
+ */
+
+ at TEMP_has_config@
+
+/*
+ * D_\w+ config entries
+ */
+
+ at TEMP_d_config@
+
+#endif /* PARROT_HAS_HEADER_H_GUARD */
+
+/*
+ * Local variables:
+ * c-file-style: "parrot"
+ * End:
+ * vim: expandtab shiftwidth=4:
+ */
Modified: branches/tt761_keys_revamp/config/gen/makefiles/dynoplibs.in
==============================================================================
--- branches/tt761_keys_revamp/config/gen/makefiles/dynoplibs.in Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/config/gen/makefiles/dynoplibs.in Fri Jul 10 22:11:09 2009 (r39981)
@@ -25,10 +25,10 @@
LINKARGS := $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @icu_shared@ @libs@
OPS_TARGETS := \
-#IF(cg_flag): myops_ops_cg$(LOAD_EXT) \
-#IF(cg_flag): myops_ops_cgp$(LOAD_EXT) \
- myops_ops$(LOAD_EXT) \
- myops_ops_switch$(LOAD_EXT)
+#IF(cg_flag): obscure_ops_cg$(LOAD_EXT) \
+#IF(cg_flag): obscure_ops_cgp$(LOAD_EXT) \
+ obscure_ops$(LOAD_EXT) \
+ obscure_ops_switch$(LOAD_EXT)
CLEANUPS := \
"*.c" \
@@ -51,41 +51,41 @@
Makefile: ../../config/gen/makefiles/dynoplibs.in
cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::makefiles --target=src/dynoplibs/Makefile
-myops_ops$(LOAD_EXT): myops_ops$(O)
- $(LD) $(LD_OUT)myops_ops$(LOAD_EXT) myops_ops$(O) $(LINKARGS)
+obscure_ops$(LOAD_EXT): obscure_ops$(O)
+ $(LD) $(LD_OUT)obscure_ops$(LOAD_EXT) obscure_ops$(O) $(LINKARGS)
-myops_ops$(O): myops_ops.c
- $(CC) $(CC_OUT)myops_ops$(O) $(INCLUDES) $(CFLAGS) myops_ops.c
+obscure_ops$(O): obscure_ops.c
+ $(CC) $(CC_OUT)obscure_ops$(O) $(INCLUDES) $(CFLAGS) obscure_ops.c
-myops_ops.c: myops.ops
- $(OPS2C) C --dynamic myops.ops
+obscure_ops.c: obscure.ops
+ $(OPS2C) C --dynamic obscure.ops
-myops_ops_switch$(LOAD_EXT): myops_ops_switch$(O)
- $(LD) $(LD_OUT)myops_ops_switch$(LOAD_EXT) myops_ops_switch$(O) $(LINKARGS)
+obscure_ops_switch$(LOAD_EXT): obscure_ops_switch$(O)
+ $(LD) $(LD_OUT)obscure_ops_switch$(LOAD_EXT) obscure_ops_switch$(O) $(LINKARGS)
-myops_ops_switch$(O): myops_ops_switch.c
- $(CC) $(CC_OUT)myops_ops_switch$(O) $(INCLUDES) $(CFLAGS) myops_ops_switch.c
+obscure_ops_switch$(O): obscure_ops_switch.c
+ $(CC) $(CC_OUT)obscure_ops_switch$(O) $(INCLUDES) $(CFLAGS) obscure_ops_switch.c
-myops_ops_switch.c: myops.ops
- $(OPS2C) CSwitch --dynamic myops.ops
+obscure_ops_switch.c: obscure.ops
+ $(OPS2C) CSwitch --dynamic obscure.ops
-myops_ops_cg$(LOAD_EXT): myops_ops_cg$(O)
- $(LD) $(LD_OUT)myops_ops_cg$(LOAD_EXT) myops_ops_cg$(O) $(LINKARGS)
+obscure_ops_cg$(LOAD_EXT): obscure_ops_cg$(O)
+ $(LD) $(LD_OUT)obscure_ops_cg$(LOAD_EXT) obscure_ops_cg$(O) $(LINKARGS)
-myops_ops_cg$(O): myops_ops_cg.c
- $(CC) $(CC_OUT)myops_ops_cg$(O) $(INCLUDES) $(CFLAGS) myops_ops_cg.c
+obscure_ops_cg$(O): obscure_ops_cg.c
+ $(CC) $(CC_OUT)obscure_ops_cg$(O) $(INCLUDES) $(CFLAGS) obscure_ops_cg.c
-myops_ops_cg.c: myops.ops
- $(OPS2C) CGoto --dynamic myops.ops
+obscure_ops_cg.c: obscure.ops
+ $(OPS2C) CGoto --dynamic obscure.ops
-myops_ops_cgp$(LOAD_EXT): myops_ops_cgp$(O)
- $(LD) $(LD_OUT)myops_ops_cgp$(LOAD_EXT) myops_ops_cgp$(O) $(LINKARGS)
+obscure_ops_cgp$(LOAD_EXT): obscure_ops_cgp$(O)
+ $(LD) $(LD_OUT)obscure_ops_cgp$(LOAD_EXT) obscure_ops_cgp$(O) $(LINKARGS)
-myops_ops_cgp$(O): myops_ops_cgp.c
- $(CC) $(CC_OUT)myops_ops_cgp$(O) $(INCLUDES) $(CFLAGS) myops_ops_cgp.c
+obscure_ops_cgp$(O): obscure_ops_cgp.c
+ $(CC) $(CC_OUT)obscure_ops_cgp$(O) $(INCLUDES) $(CFLAGS) obscure_ops_cgp.c
-myops_ops_cgp.c: myops.ops
- $(OPS2C) CGP --dynamic myops.ops
+obscure_ops_cgp.c: obscure.ops
+ $(OPS2C) CGP --dynamic obscure.ops
test : all
cd ../.. && $(PERL) -Ilib t/harness t/dynoplibs/*.t
Modified: branches/tt761_keys_revamp/config/gen/platform/generic/threads.h
==============================================================================
--- branches/tt761_keys_revamp/config/gen/platform/generic/threads.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/config/gen/platform/generic/threads.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -9,16 +9,18 @@
* POSIX threading stuff
*/
-#ifdef PARROT_HAS_HEADER_PTHREAD
+#ifdef PARROT_HAS_THREADS
+
# include "parrot/thr_pthread.h"
-#endif
-#ifdef PARROT_HAS_HEADER_UNISTD
-# include <unistd.h>
-# ifdef _POSIX_PRIORITY_SCHEDULING
-# define YIELD sched_yield()
-# endif
-#endif
+# ifdef PARROT_HAS_HEADER_UNISTD
+# include <unistd.h>
+# ifdef _POSIX_PRIORITY_SCHEDULING
+# define YIELD sched_yield()
+# endif
+# endif /* PARROT_HAS_HEADER_UNISTD */
+
+#endif /* PARROT_HAS_THREADS */
#endif /* PARROT_PLATFORM_GENERIC_THREADS_H_GUARD */
Modified: branches/tt761_keys_revamp/config/gen/platform/win32/dl.c
==============================================================================
--- branches/tt761_keys_revamp/config/gen/platform/win32/dl.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/config/gen/platform/win32/dl.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -78,7 +78,7 @@
void *
Parrot_dlsym(void *handle, const char *symbol)
{
- return (void *)GetProcAddress(handle, symbol);
+ return (void *)GetProcAddress((HINSTANCE)handle, symbol);
}
/*
@@ -102,7 +102,7 @@
int
Parrot_dlclose(void *handle)
{
- return FreeLibrary(handle)? 0: 1;
+ return FreeLibrary((HMODULE)handle)? 0: 1;
}
/*
Modified: branches/tt761_keys_revamp/config/gen/platform/win32/env.c
==============================================================================
--- branches/tt761_keys_revamp/config/gen/platform/win32/env.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/config/gen/platform/win32/env.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -54,7 +54,7 @@
const int value_len = strlen(value);
{
- char * const envstring = mem_internal_allocate(
+ char * const envstring = (char * const)mem_internal_allocate(
name_len /* name */
+ 1 /* '=' */
+ value_len /* value */
@@ -106,7 +106,7 @@
else {
*free_it = 1;
}
- buffer = mem_sys_allocate(size);
+ buffer = (char *)mem_sys_allocate(size);
GetEnvironmentVariable(name, buffer, size);
return buffer;
Modified: branches/tt761_keys_revamp/config/gen/platform/win32/exec.c
==============================================================================
--- branches/tt761_keys_revamp/config/gen/platform/win32/exec.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/config/gen/platform/win32/exec.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -42,7 +42,7 @@
STARTUPINFO si;
PROCESS_INFORMATION pi;
int free_it = 0;
- char* cmd = mem_sys_allocate(command->strlen + 4);
+ char* cmd = (char *)mem_sys_allocate(command->strlen + 4);
char* shell = Parrot_getenv("ComSpec", &free_it);
char* cmdin = Parrot_str_to_cstring(interp, command);
@@ -98,7 +98,7 @@
int pmclen;
int cmdlinelen = 1000;
int cmdlinepos = 0;
- char *cmdline = mem_sys_allocate(cmdlinelen);
+ char *cmdline = (char *)mem_sys_allocate(cmdlinelen);
int i;
/* Ensure there's something in the PMC array. */
@@ -113,7 +113,7 @@
char *cs = Parrot_str_to_cstring(interp, s);
if (cmdlinepos + (int)s->strlen + 3 > cmdlinelen) {
cmdlinelen += s->strlen + 4;
- cmdline = mem_sys_realloc(cmdline, cmdlinelen);
+ cmdline = (char *)mem_sys_realloc(cmdline, cmdlinelen);
}
strcpy(cmdline + cmdlinepos, "\"");
strcpy(cmdline + cmdlinepos + 1, cs);
@@ -164,7 +164,7 @@
int status;
char *in = Parrot_str_to_cstring(interp, command);
char *cmd = NULL;
- const char **argv = mem_sys_allocate_zeroed(2 * sizeof (int));
+ const char **argv = (const char **)mem_sys_allocate_zeroed(2 * sizeof (int));
/* Grab string, extract command and parameters. */
char *curPos = in;
@@ -196,7 +196,7 @@
int lenFound = curPos - lastCommandStart;
if (*(curPos + 1) == 0)
lenFound++;
- tmp = mem_sys_allocate(1 + lenFound);
+ tmp = (char *)mem_sys_allocate(1 + lenFound);
memcpy(tmp, lastCommandStart, lenFound);
*(tmp + lenFound) = 0;
@@ -210,7 +210,7 @@
{
/* Allocate space for another pointer in **argv. */
argc++;
- argv = mem_sys_realloc(argv, (argc + 1) * sizeof (int));
+ argv = (const char **)mem_sys_realloc(argv, (argc + 1) * sizeof (int));
*(argv + (argc - 1)) = tmp;
*(argv + argc) = NULL;
}
Modified: branches/tt761_keys_revamp/config/gen/platform/win32/threads.h
==============================================================================
--- branches/tt761_keys_revamp/config/gen/platform/win32/threads.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/config/gen/platform/win32/threads.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -6,7 +6,16 @@
#ifndef PARROT_PLATFORM_WIN32_THREADS_H_GUARD
#define PARROT_PLATFORM_WIN32_THREADS_H_GUARD
-#include "parrot/thr_windows.h"
+#undef CONST
+#include <windows.h>
+
+#ifdef PARROT_HAS_THREADS
+
+# include "parrot/thr_windows.h"
+
+#endif /* PARROT_HAS_THREADS */
+
+#undef CONST
#endif /* PARROT_PLATFORM_WIN32_THREADS_H_GUARD */
Modified: branches/tt761_keys_revamp/docs/compiler_faq.pod
==============================================================================
--- branches/tt761_keys_revamp/docs/compiler_faq.pod Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/docs/compiler_faq.pod Fri Jul 10 22:11:09 2009 (r39981)
@@ -692,25 +692,6 @@
language to be used without having to place them into the Parrot core itself.
For examples of dynamic op libraries, see L<src/dynoplibs>.
-To build dynamic op libraries, add something like the following to your
-makefile:
-
- PERL = /usr/bin/perl
- OPSBUILD = $(PERL) /path/to/parrot/tools/build/dynops.pl
- DESTDIR = /path/to/parrot/runtime/parrot/dynext
- LOAD_EXT = .so
-
- OPSDIR = ops
- OPLIBS = myops
- OPS_FILES = myops.ops
-
- dynops : $(OPS_FILES)
- @cd $(OPSDIR) && $(BUILD) generate $(OPLIBS)
- @cd $(OPSDIR) && $(BUILD) compile $(OPLIBS)
- @cd $(OPSDIR) && $(BUILD) linklibs $(OPLIBS)
- @cd $(OPSDIR) && $(BUILD) copy "--destination=$(DESTDIR)" $(OPLIBS)
-
-
=head2 How do I use the Native Calling Interface (NCI)?
Using the NCI you can invoke functions written in C from a Parrot script.
Modified: branches/tt761_keys_revamp/docs/dev/events.pod
==============================================================================
--- branches/tt761_keys_revamp/docs/dev/events.pod Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/docs/dev/events.pod Fri Jul 10 22:11:09 2009 (r39981)
@@ -31,8 +31,7 @@
=head2 Events
Events can be either timed (they are due after some elapsed time) or untimed.
-For the former there is one API call: B<Parrot_new_timer_event>, used by the
-F<src/dynoplibs/myops.ops>:B<alarm> opcode for testing.
+For the former there is one API call: B<Parrot_new_timer_event>
=head2 The B<event_thread>
Modified: branches/tt761_keys_revamp/editor/skeleton.pir
==============================================================================
--- branches/tt761_keys_revamp/editor/skeleton.pir Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/editor/skeleton.pir Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
# Copyright (C) 2006-2009, Parrot Foundation.
# $Id$
-.sub main :main
+.sub 'main' :main
.end
# Local Variables:
Modified: branches/tt761_keys_revamp/examples/library/ncurses_life.pir
==============================================================================
--- branches/tt761_keys_revamp/examples/library/ncurses_life.pir Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/examples/library/ncurses_life.pir Fri Jul 10 22:11:09 2009 (r39981)
@@ -884,7 +884,8 @@
=head1 SEE ALSO
F<examples/library/acorn.life>, F<examples/pasm/life.pasm>,
-F<library/ncurses.pasm>, F<library/ncurses.declarations>.
+F<runtime/parrot/library/ncurses.pasm>,
+F<runtime/parrot/library/ncurses.declarations>.
=head1 NOTE
Modified: branches/tt761_keys_revamp/include/parrot/atomic.h
==============================================================================
--- branches/tt761_keys_revamp/include/parrot/atomic.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/include/parrot/atomic.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -17,9 +17,7 @@
# include "parrot/has_header.h"
# include "parrot/thread.h"
-# define PARROT_HAS_NATIVE_ATOMIC 1 /* we'll redefine later if need be */
-
-#if (PARROT_HAS_THREADS)
+#ifdef PARROT_HAS_THREADS
# if defined(PARROT_HAS_I386_GCC_CMPXCHG)
# include "parrot/atomic/gcc_x86.h"
# elif defined(PARROT_HAS_PPC_GCC_CMPSET)
@@ -27,8 +25,6 @@
# elif defined(PARROT_HAS_SPARC_ATOMIC)
# include "parrot/atomic/sparc.h"
# else
-# undef PARROT_HAS_NATIVE_ATOMIC
-# define PARROT_HAS_NATIVE_ATOMIC 0
# include "parrot/atomic/fallback.h"
# endif
#else
@@ -36,12 +32,12 @@
void *val;
} Parrot_atomic_pointer;
-typedef Parrot_atomic_integer {
+typedef struct Parrot_atomic_integer {
INTVAL val;
} Parrot_atomic_integer;
# define PARROT_ATOMIC_PTR_INIT(a)
-# define PARROT_ATOMIC_PTR_GET(result, (a)) (result) = (a).val
+# define PARROT_ATOMIC_PTR_GET(result, a) (result) = (a).val
# define PARROT_ATOMIC_PTR_SET(a, b) (a).val = (b)
/* a is the Parrot_atomic.
@@ -65,7 +61,7 @@
# define PARROT_ATOMIC_PTR_DESTROY(a)
# define PARROT_ATOMIC_INT_INIT(a)
# define PARROT_ATOMIC_INT_DESTROY(a)
-# define PARROT_ATOMIC_INT_GET(result, (a)) (result) = (a).val
+# define PARROT_ATOMIC_INT_GET(result, a) (result) = (a).val
# define PARROT_ATOMIC_INT_SET(a, value) (a).val = (value)
# define PARROT_ATOMIC_INT_CAS(result, a, expect, update) \
do { \
@@ -82,7 +78,6 @@
# define PARROT_ATOMIC_INT_INC(result, a) ((result) = ++(a).val)
# define PARROT_ATOMIC_INT_DEC(result, a) ((result) = --(a).val)
-
#endif /* PARROT_HAS_THREADS */
#endif /* PARROT_ATOMIC_H_GUARD */
Modified: branches/tt761_keys_revamp/include/parrot/interpreter.h
==============================================================================
--- branches/tt761_keys_revamp/include/parrot/interpreter.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/include/parrot/interpreter.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,5 +1,5 @@
/* interpreter.h
- * Copyright (C) 2001-2007, Parrot Foundation.
+ * Copyright (C) 2001-2009, Parrot Foundation.
* SVN Info
* $Id$
* Overview:
@@ -290,8 +290,10 @@
* runloop ID, so it still needs to be a separate stack for a while longer. */
typedef struct parrot_runloop_t {
- Parrot_jump_buff resume; /* jmp_buf */
- struct parrot_runloop_t *prev; /* interpreter's runloop jump buffer stack */
+ Parrot_jump_buff resume; /* jmp_buf */
+ struct parrot_runloop_t *prev; /* interpreter's runloop
+ * jump buffer stack */
+ opcode_t *handler_start; /* Used in exception handling */
} parrot_runloop_t;
typedef parrot_runloop_t Parrot_runloop;
Modified: branches/tt761_keys_revamp/include/parrot/io.h
==============================================================================
--- branches/tt761_keys_revamp/include/parrot/io.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/include/parrot/io.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -849,12 +849,12 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
INTVAL Parrot_io_socket(PARROT_INTERP,
- ARGMOD_NULLOK(PMC * socket),
+ ARGMOD_NULLOK(PMC *socket),
INTVAL fam,
INTVAL type,
INTVAL proto)
__attribute__nonnull__(1)
- FUNC_MODIFIES(* socket);
+ FUNC_MODIFIES(*socket);
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
Modified: branches/tt761_keys_revamp/include/parrot/list.h
==============================================================================
--- branches/tt761_keys_revamp/include/parrot/list.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/include/parrot/list.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -192,12 +192,13 @@
PARROT_EXPORT
void list_splice(PARROT_INTERP,
ARGMOD(List *list),
- ARGIN_NULLOK(List *value_list),
+ ARGMOD_NULLOK(List *value_list),
INTVAL offset,
INTVAL count)
__attribute__nonnull__(1)
__attribute__nonnull__(2)
- FUNC_MODIFIES(*list);
+ FUNC_MODIFIES(*list)
+ FUNC_MODIFIES(*value_list);
PARROT_EXPORT
void list_unshift(PARROT_INTERP,
Modified: branches/tt761_keys_revamp/include/parrot/parrot.h
==============================================================================
--- branches/tt761_keys_revamp/include/parrot/parrot.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/include/parrot/parrot.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -102,10 +102,6 @@
typedef jmp_buf Parrot_jump_buff;
#endif /* PARROT_HAS_HEADER_SETJMP */
-#ifdef PARROT_HAS_HEADER_PTHREAD
-# include <pthread.h>
-#endif /* PARROT_HAS_HEADER_PTHREAD */
-
#ifdef PARROT_HAS_HEADER_LIMITS
# include <limits.h>
#endif /* PARROT_HAS_HEADER_LIMITS */
Modified: branches/tt761_keys_revamp/include/parrot/thr_pthread.h
==============================================================================
--- branches/tt761_keys_revamp/include/parrot/thr_pthread.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/include/parrot/thr_pthread.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -18,7 +18,6 @@
# include <pthread.h>
-# define PARROT_SYNC_PRIMITIVES_DEFINED
# define LOCK(m) pthread_mutex_lock((pthread_mutex_t*)&(m))
# define UNLOCK(m) pthread_mutex_unlock((pthread_mutex_t*)&(m))
# define COND_WAIT(c, m) pthread_cond_wait(&(c), &(m))
Modified: branches/tt761_keys_revamp/include/parrot/thr_windows.h
==============================================================================
--- branches/tt761_keys_revamp/include/parrot/thr_windows.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/include/parrot/thr_windows.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -13,14 +13,10 @@
#ifndef PARROT_THR_WINDOWS_H_GUARD
#define PARROT_THR_WINDOWS_H_GUARD
-# undef CONST
-# include <windows.h>
# undef FASTCALL
# include <process.h>
# include <limits.h>
-# define PARROT_SYNC_PRIMITIVES_DEFINED
-
typedef CRITICAL_SECTION Parrot_mutex;
typedef struct Windows_cond
{
@@ -131,8 +127,6 @@
};
#endif /* HAVE_STRUCT_TIMESPEC */
-# undef CONST
-
#endif /* PARROT_THR_WINDOWS_H_GUARD */
/*
Modified: branches/tt761_keys_revamp/include/parrot/thread.h
==============================================================================
--- branches/tt761_keys_revamp/include/parrot/thread.h Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/include/parrot/thread.h Fri Jul 10 22:11:09 2009 (r39981)
@@ -14,14 +14,9 @@
#define PARROT_THREAD_H_GUARD
# include "parrot/parrot.h"
-
-# define PARROT_HAS_THREADS 1
# include "parrot/atomic.h"
-#ifndef PARROT_SYNC_PRIMITIVES_DEFINED
-
-# undef PARROT_HAS_THREADS
-# define PARROT_HAS_THREADS 0
+#ifndef PARROT_HAS_THREADS
# define LOCK(m)
# define UNLOCK(m)
@@ -51,15 +46,15 @@
typedef void (*Cleanup_Handler)(void *);
-# ifndef _STRUCT_TIMESPEC
-# define _STRUCT_TIMESPEC
+# ifndef __timespec_defined
+# define __timespec_defined
struct timespec {
time_t tv_sec;
long tv_nsec;
};
-# endif /* _STRUCT_TIMESPEC */
+# endif /* __timespec_defined */
-#endif /* PARROT_SYNC_PRIMITIVES_DEFINED */
+#endif /* PARROT_HAS_THREADS */
#ifndef YIELD
# define YIELD
Modified: branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Conf.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Conf.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Conf.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -96,6 +96,7 @@
--execcapable Use JIT to emit a native executable
--gc=(type) Determine the type of garbage collection
type=(gc|libc|malloc|malloc-trace) default is gc
+ --without-threads Build parrot without thread support
External Library Options:
Modified: branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Conf/Shared.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Conf/Shared.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Conf/Shared.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -72,9 +72,10 @@
without-gdbm
without-gettext
without-gmp
+ without-icu
without-opengl
without-pcre
- without-icu
+ without-threads
yacc
};
Modified: branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Test/Prepare.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Test/Prepare.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/Configure/Options/Test/Prepare.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -4,6 +4,9 @@
use strict;
use warnings;
use Carp;
+use Data::Dumper;$Data::Dumper::Indent=1;
+use File::Find;
+#use Scalar::Util qw( looks_like_number );
use base qw( Exporter );
our @EXPORT_OK = qw(
get_preconfiguration_tests
@@ -16,11 +19,12 @@
my @framework_tests = _get_framework_tests($config_dir);
my $steps_dir = q{t/steps};
-my $steps_tests_ref = _get_steps_tests($steps_dir);
+my ( $steps_tests_simple_ref, $steps_tests_complex_ref ) =
+ _find_steps_tests($steps_dir);
my @steps_expected = get_steps_list();
my @steps_tests = _prepare_steps_tests_list(
$steps_dir,
- $steps_tests_ref,
+ $steps_tests_complex_ref,
\@steps_expected,
);
@@ -52,36 +56,57 @@
return @framework_tests;
}
-sub _get_steps_tests {
+my %steps_tests_simple = ();
+my %steps_tests_complex = ();
+sub _find_steps_tests {
my $steps_dir = shift;
- my %steps_tests = ();
- opendir my $DIRH2, $steps_dir or croak "Unable to open $steps_dir";
- for my $t (grep { /\.t$/ } readdir $DIRH2) {
- my ($type, $class, $num);
- if ($t =~ m/(init|inter|auto|gen)_(\w+)-(\d{2})\.t$/) {
- ($type, $class, $num) = ($1,$2,$3);
- $steps_tests{$type}{$class}{$num}++;
+ sub wanted {
+ if ( $File::Find::name =~
+ m<
+ (init|inter|auto|gen) # category
+ /
+ ([a-z_\d]+) # class
+ (?:/
+ ([a-z_]+) # second-level
+ )? # may not be defined
+ -
+ (\d{2}) # number
+ \.t$
+ >x ) {
+ $steps_tests_simple{$File::Find::name}++;
+ my ($category, $class, $secondlevel, $number) =
+ ($1, $2, $3 || q{}, $4);
+ my $final = ( $secondlevel )
+ ? qq|$secondlevel-$number|
+ : $number;
+ $steps_tests_complex{$category}{$class}{$final}++;
}
- else {
- carp "Unable to match $t";
- }
- }
- closedir $DIRH2 or croak "Unable to close $steps_dir";
- return \%steps_tests;
+ } # END wanted()
+ finddepth( \&wanted, ( $steps_dir ) );
+ return ( \%steps_tests_simple, \%steps_tests_complex );
}
sub _prepare_steps_tests_list {
my $steps_dir = shift;
my $steps_tests_ref = shift;
my $steps_expected_ref = shift;
- my %steps_tests = %{ $steps_tests_ref };
my @steps_tests;
+ # The order of tests of config steps is governed by
+ # Parrot::Configure::Step::List::get_steps_list().
foreach my $step ( @{ $steps_expected_ref } ) {
- my @temp = split /::/, $step;
- my $these_tests = $steps_tests{$temp[0]}{$temp[1]}
+ my @module_path = split /::/, $step;
+ my $these_tests = $steps_tests_ref->{$module_path[0]}{$module_path[1]}
or carp "No tests exist for configure step $step";
foreach my $k (sort keys %$these_tests) {
- push @steps_tests, qq{$steps_dir/$temp[0]_$temp[1]-$k.t};
+ if ( $k =~ m/^(\w+)-(\d{2})$/ ) {
+ my ($secondlevel, $number) = ($1, $2);
+ push @steps_tests,
+ qq{$steps_dir/$module_path[0]/$module_path[1]/$secondlevel-$number.t};
+ }
+ else {
+ push @steps_tests,
+ qq{$steps_dir/$module_path[0]/$module_path[1]-$k.t};
+ }
}
}
return @steps_tests;
Modified: branches/tt761_keys_revamp/lib/Parrot/Configure/Step/List.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/Configure/Step/List.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/Configure/Step/List.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -52,6 +52,7 @@
auto::socklen_t
auto::neg_0
auto::env
+ auto::thread
auto::gmp
auto::readline
auto::gdbm
Modified: branches/tt761_keys_revamp/lib/Parrot/Distribution.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/Distribution.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/Distribution.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -431,6 +431,7 @@
compilers/pirc/macro/macroparser.c
compilers/pirc/macro/macroparser.h
include/parrot/config.h
+ include/parrot/has_header.h
src/gc/malloc.c
} unless @exemptions;
Modified: branches/tt761_keys_revamp/lib/Parrot/IO/Directory.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/IO/Directory.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/IO/Directory.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -131,7 +131,7 @@
unless ( -e $self->path ) {
# This dies if it fails.
- mkpath( $self->path );
+ mkpath( [ $self->path ], 0, 0777 );
}
return -d $self->path;
Modified: branches/tt761_keys_revamp/lib/Parrot/IO/Path.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/IO/Path.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/IO/Path.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -101,7 +101,7 @@
unless ( -e $self->parent_path ) {
# This dies if it fails.
- mkpath( $self->parent_path );
+ mkpath( [ $self->parent_path ], 0, 0777 );
}
return -e $self->parent_path;
Modified: branches/tt761_keys_revamp/lib/Parrot/Ops2pm.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/Ops2pm.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/Ops2pm.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -323,7 +323,7 @@
my $cwd = cwd();
my $fulldir = File::Spec->catdir( $cwd, $self->{moddir} );
if ( !-d $fulldir ) {
- if ( !File::Path::mkpath( $fulldir, { mode => 0755 } ) ) {
+ if ( !File::Path::mkpath( [ $fulldir ], 0, 0755 ) ) {
-d $fulldir
or die "$self->{script}: Could not mkdir $fulldir: $!!\n";
}
@@ -412,7 +412,7 @@
my $cwd = cwd();
my $fulldir = File::Spec->catdir( $cwd, $self->{inc_dir} );
if ( !-d $fulldir ) {
- if ( !File::Path::mkpath( $fulldir, { mode => 0755 } ) ) {
+ if ( !File::Path::mkpath( [ $fulldir ], 0, 0755 ) ) {
-d $fulldir
or die "$self->{script}: Could not mkdir $fulldir: $!!\n";
}
Modified: branches/tt761_keys_revamp/lib/Parrot/OpsFile.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/OpsFile.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/OpsFile.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -535,22 +535,24 @@
# with labels, etc.).
#
- $branch ||= $body =~ s/\bgoto\s+OFFSET\(\( (.*?) \)\)/{{+=$1}}/mg;
$absolute ||= $body =~ s/\bgoto\s+ADDRESS\(\( (.*?) \)\)/{{=$1}}/mg;
- $body =~ s/\bexpr\s+OFFSET\(\( (.*?) \)\)/{{^+$1}}/mg;
- $body =~ s/\bexpr\s+ADDRESS\(\( (.*?) \)\)/{{^$1}}/mg;
- $body =~ s/\bOP_SIZE\b/{{^$op_size}}/mg;
-
- $branch ||= $body =~ s/\bgoto\s+OFFSET\((.*?)\)/{{+=$1}}/mg;
- $body =~ s/\bgoto\s+NEXT\(\)/{{+=$op_size}}/mg;
+ $body =~ s/\bexpr\s+ADDRESS\(\( (.*?) \)\)/{{^$1}}/mg;
$absolute ||= $body =~ s/\bgoto\s+ADDRESS\((.*?)\)/{{=$1}}/mg;
+ $body =~ s/\bexpr\s+ADDRESS\((.*?)\)/{{^$1}}/mg;
+
+ $branch ||= $body =~ s/\bgoto\s+OFFSET\(\( (.*?) \)\)/{{+=$1}}/mg;
+ $body =~ s/\bexpr\s+OFFSET\(\( (.*?) \)\)/{{^+$1}}/mg;
+ $branch ||= $body =~ s/\bgoto\s+OFFSET\((.*?)\)/{{+=$1}}/mg;
+ $body =~ s/\bexpr\s+OFFSET\((.*?)\)/{{^+$1}}/mg;
+
$pop ||= $body =~ s/\bgoto\s+POP\(\)/{{=*}}/mg;
- $body =~ s/\bexpr\s+OFFSET\((.*?)\)/{{^+$1}}/mg;
- $next ||= $body =~ s/\bexpr\s+NEXT\(\)/{{^+$op_size}}/mg;
- $body =~ s/\bexpr\s+ADDRESS\((.*?)\)/{{^$1}}/mg;
- $body =~ s/\bexpr\s+POP\(\)/{{^*}}/mg;
+ $body =~ s/\bexpr\s+POP\(\)/{{^*}}/mg;
+
+ $next ||= $body =~ s/\bexpr\s+NEXT\(\)/{{^+$op_size}}/mg;
+ $body =~ s/\bgoto\s+NEXT\(\)/{{+=$op_size}}/mg;
$body =~ s/\bHALT\(\)/{{=0}}/mg;
+ $body =~ s/\bOP_SIZE\b/{{^$op_size}}/mg;
$branch ||= $short_name =~ /runinterp/;
$next ||= $short_name =~ /runinterp/;
@@ -577,7 +579,7 @@
my $max_arg_num = @$args;
my @found_args = ($body =~ m/{{@(\d+)}}/g);
foreach my $arg (@found_args) {
- die "opcode '$short_name' uses '\$$arg' but only has $max_arg_num parameters.\n" if $arg > $max_arg_num;
+ die "opcode '$short_name' uses '\$$arg' but only has $max_arg_num parameters.\n" if $arg > $max_arg_num;
}
Modified: branches/tt761_keys_revamp/lib/Parrot/Test.pm
==============================================================================
--- branches/tt761_keys_revamp/lib/Parrot/Test.pm Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/lib/Parrot/Test.pm Fri Jul 10 22:11:09 2009 (r39981)
@@ -959,22 +959,13 @@
{
my $cfg = File::Spec->join( 'src', "parrot_config$PConfig{o}" );
my $iculibs = $PConfig{has_icu} ? $PConfig{icu_shared} : q{};
- my $libparrot =
- $PConfig{parrot_is_shared}
- ? ("$PConfig{rpath_blib} "
- . (($^O =~ m/MSWin32/ and $PConfig{cc} =~ /\bcl\b/)
- ? ""
- : "-L$PConfig{blib_dir} "))
- . ($^O =~ m/MSWin32/
- ? $PConfig{libparrot_linkflags}
- : "-lparrot")
- : File::Spec->join(
- @PConfig{qw/build_dir blib_dir libparrot_static/},
- );
my $cmd =
- "$PConfig{link} $PConfig{linkflags} $PConfig{ld_debug} "
- . "$obj_f $cfg $PConfig{ld_out}$exe_f "
- . "$libparrot $iculibs $PConfig{libs}";
+ "$PConfig{link} "
+ . "$PConfig{ld_out}$exe_f "
+ . "$obj_f $cfg "
+ . "$PConfig{libparrot_linkflags} "
+ . "$PConfig{linkflags} $PConfig{ld_debug} "
+ . "$iculibs $PConfig{libs}";
my $exit_code = run_command(
$cmd,
'STDOUT' => $build_f,
Modified: branches/tt761_keys_revamp/runtime/parrot/library/P6object.pir
==============================================================================
--- branches/tt761_keys_revamp/runtime/parrot/library/P6object.pir Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/runtime/parrot/library/P6object.pir Fri Jul 10 22:11:09 2009 (r39981)
@@ -762,7 +762,6 @@
normal_check:
$I0 = can topic, 'HOW'
unless $I0 goto end
- topichow = topic.'HOW'()
topicwhat = topic.'WHAT'()
$I0 = isa topicwhat, parrotclass
if $I0 goto end
Modified: branches/tt761_keys_revamp/runtime/parrot/library/PGE/Perl6Grammar.pir
==============================================================================
--- branches/tt761_keys_revamp/runtime/parrot/library/PGE/Perl6Grammar.pir Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/runtime/parrot/library/PGE/Perl6Grammar.pir Fri Jul 10 22:11:09 2009 (r39981)
@@ -140,9 +140,9 @@
.param pmc source
.param pmc adverbs :slurpy :named
- .local pmc nstable, namespace
+ .local pmc nstable, ns
nstable = new 'Hash'
- namespace = new 'String'
+ ns = new 'String'
$P0 = new 'Hash'
$P1 = new 'CodeString'
$P0['optable'] = $P1
@@ -165,7 +165,7 @@
$S0 = match['cmd']
concat $S0, '_stmt'
$P0 = find_name $S0
- $P0(match, namespace, nstable)
+ $P0(match, ns, nstable)
goto stmt_loop
stmt_end:
Modified: branches/tt761_keys_revamp/src/call/ops.c
==============================================================================
--- branches/tt761_keys_revamp/src/call/ops.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/call/ops.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -88,24 +88,37 @@
#endif
{
new_runloop_jump_point(interp);
- if (setjmp(interp->current_runloop->resume)) {
- /* an exception was handled */
- if (STACKED_EXCEPTIONS)
- free_runloop_jump_point(interp);
+ reenter:
+ interp->current_runloop->handler_start = NULL;
+ switch (setjmp(interp->current_runloop->resume)) {
+ case 1:
+ /* an exception was handled */
+ if (STACKED_EXCEPTIONS)
+ free_runloop_jump_point(interp);
- interp->current_runloop_level = our_runloop_level - 1;
- interp->current_runloop_id = old_runloop_id;
+ interp->current_runloop_level = our_runloop_level - 1;
+ interp->current_runloop_id = old_runloop_id;
#if RUNLOOP_TRACE
- fprintf(stderr, "[handled exception; back to loop %d, level %d]\n",
- interp->current_runloop_id, interp->current_runloop_level);
+ fprintf(stderr, "[handled exception; back to loop %d, level %d]\n",
+ interp->current_runloop_id, interp->current_runloop_level);
#endif
- return;
+ return;
+ case 2:
+ /* Reenter the runloop from a exception thrown from C
+ * with a pir handler */
+ PARROT_ASSERT(interp->current_runloop->handler_start);
+ offset = interp->current_runloop->handler_start - interp->code->base.data;
+ /* Prevent incorrect reuse */
+ goto reenter;
+ default:
+ break;
}
}
runops_int(interp, offset);
+ interp->current_runloop->handler_start = NULL;
/* Remove the current runloop marker (put it on the free list). */
if (STACKED_EXCEPTIONS || interp->current_runloop)
free_runloop_jump_point(interp);
Modified: branches/tt761_keys_revamp/src/call/pcc.c
==============================================================================
--- branches/tt761_keys_revamp/src/call/pcc.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/call/pcc.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -1415,10 +1415,11 @@
if (st->n_actual_args < min_expected_args) {
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
- "too few arguments passed (%d) - %s%d %s expected",
+ "too few arguments passed (%d) - %s%d %s%s expected",
st->n_actual_args,
(min_expected_args < max_expected_args ? "at least " : ""),
- min_expected_args, action);
+ min_expected_args, action,
+ (min_expected_args == 1 ? "" : "s"));
}
}
@@ -1443,10 +1444,11 @@
if (st->n_actual_args > max_expected_args) {
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
- "too many arguments passed (%d) - %s%d %s expected",
+ "too many arguments passed (%d) - %s%d %s%s expected",
st->n_actual_args,
(min_expected_args < max_expected_args ? "at most " : ""),
- max_expected_args, action);
+ max_expected_args, action,
+ (max_expected_args == 1 ? "" : "s"));
}
}
@@ -1623,7 +1625,7 @@
call_state_item *src, *dest;
const char * const action = (param_or_result == PARROT_PASS_RESULTS)
- ? "results" : "params";
+ ? "result" : "param";
/* Check if we should be throwing errors. This can be configured separately
* for parameters and return values. */
Deleted: branches/tt761_keys_revamp/src/dynoplibs/myops.ops
==============================================================================
--- branches/tt761_keys_revamp/src/dynoplibs/myops.ops Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,131 +0,0 @@
-/*
- Copyright (C) 2003-2008, Parrot Foundation.
- $Id$
-*/
-
-#include "parrot/dynext.h"
-#include <stdlib.h>
-
-VERSION = PARROT_VERSION;
-
-=head1 NAME
-
-myops.ops - Sample Dynamic Opcodes 2
-
-=cut
-
-=head1 DESCRIPTION
-
-A dynamic oplib loadable at demand.
-
-=cut
-
-=head1 Essential ops
-
-=over 4
-
-=item B<fortytwo>(out INT)
-
-The famous and ever wanted opcode, proposed by Jos Visser in
-"We *need* this op! :-)".
-
-=item B<what_do_you_get_if_you_multiply_six_by_nine>(out INT)
-
-Alternate spelling of this op, proposed by Nicholas Clark. It might bring
-imcc to its limits due the lengthy name.
-
-=cut
-
-inline op fortytwo(out INT) {
- $1 = 42;
-}
-
-inline op what_do_you_get_if_you_multiply_six_by_nine(out STR) {
- $1 = string_from_literal(interp, "fortytwo");
-}
-
-=item B<hcf>
-
-Halt and Catch Fire. Tries to crash Parrot. Note that making a segfault here
-is a Bad Thing, so this relies instead on Well Supported end-this-process
-behavior.
-
-=cut
-
-op hcf() :flow {
- abort();
-}
-
-=item B<q>
-
-Support for writing a very short quine.
-
-=cut
-
-op q() :flow {
- Parrot_io_printf(interp, ".loadlib \"myops_ops\"\nq\n");
- HALT();
-}
-
-=item B<bxand>(out INT, in INT, in INT)
-
-Binary operator, defined as A and B, but not BOTH.
-
-=cut
-
-op bxand(out INT, in INT, in INT) {
- /* short circuit boolean logic */
- $1 = 0;
-}
-
-=item B<alarm>(in NUM, in PMC)
-
-Call alarm handler sub $2 after $1 time has elapsed.
-
-=item B<alarm>(in NUM, in NUM, in PMC)
-
-Call alarm handler sub $3 after $1 time has elapsed, repeat after $2.
-
-=cut
-
-op alarm(in NUM, in PMC) {
- Parrot_cx_schedule_timer(interp, NULL, $1, 0.0, 0, $2);
-}
-
-op alarm(in NUM, in NUM, in PMC) {
- Parrot_cx_schedule_timer(interp, NULL, $1, $2, -1, $3);
-}
-
-=item B<conv_u2>(inout INT)
-
-Conversion of a two byte unsigned int to an INT.
-Formerly in dotgnu.ops.
-
-=item B<conv_i2>(inout INT)
-
-Conversion of a two byte signed int to an INT.
-Formerly in dotgnu.ops.
-
-=cut
-
-inline op conv_u2(inout INT) :base_core {
- $1 = (INTVAL)((Parrot_UInt2)($1 & 0xffff));
-}
-
-inline op conv_i2(inout INT) :base_core {
- $1 = (INTVAL)((Parrot_Int2)($1 & 0xffff));
-}
-
-
-=back
-
-=cut
-
-# vim: sw=4
-
-/*
- * Local variables:
- * c-file-style: "parrot"
- * End:
- * vim: expandtab shiftwidth=4:
- */
Copied and modified: branches/tt761_keys_revamp/src/dynoplibs/obscure.ops (from r39980, branches/tt761_keys_revamp/src/ops/obscure.ops)
==============================================================================
--- branches/tt761_keys_revamp/src/ops/obscure.ops Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/src/dynoplibs/obscure.ops Fri Jul 10 22:11:09 2009 (r39981)
@@ -17,6 +17,10 @@
Parrot's library of obscure ops.
+To use this library of ops, add this directive to your PIR:
+
+ .loadlib 'obscure_ops'
+
=cut
Modified: branches/tt761_keys_revamp/src/events.c
==============================================================================
--- branches/tt761_keys_revamp/src/events.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/events.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -1351,7 +1351,7 @@
Parrot_sleep_on_event(PARROT_INTERP, FLOATVAL t, ARGIN_NULLOK(opcode_t *next))
{
ASSERT_ARGS(Parrot_sleep_on_event)
-#if PARROT_HAS_THREADS
+#ifdef PARROT_HAS_THREADS
if (interp->sleeping)
fprintf(stderr, "nested sleep might not work\n");
Modified: branches/tt761_keys_revamp/src/exceptions.c
==============================================================================
--- branches/tt761_keys_revamp/src/exceptions.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/exceptions.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2008, Parrot Foundation.
+Copyright (C) 2001-2009, Parrot Foundation.
$Id$
=head1 NAME
@@ -343,6 +343,7 @@
Parrot_runloop *return_point = interp->current_runloop;
RunProfile * const profile = interp->profile;
+ opcode_t *address;
PMC * const handler =
Parrot_cx_find_handler_local(interp, exception);
@@ -384,12 +385,13 @@
}
/* Run the handler. */
- Parrot_runops_fromc_args(interp, handler, "vP", exception);
-
- /* After handling a C exception, you don't want to resume at the point
- * where the C exception was thrown. You want to resume the next outer
- * runloop. */
- longjmp(return_point->resume, 1);
+ address = VTABLE_invoke(interp, handler, NULL);
+ if (PMC_cont(handler)->current_results)
+ address = pass_exception_args(interp, "P", address,
+ CONTEXT(interp), exception);
+ PARROT_ASSERT(return_point->handler_start == NULL);
+ return_point->handler_start = address;
+ longjmp(return_point->resume, 2);
}
/*
Modified: branches/tt761_keys_revamp/src/gc/api.c
==============================================================================
--- branches/tt761_keys_revamp/src/gc/api.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/gc/api.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -398,6 +398,7 @@
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_ALLOCATION_ERROR,
"Parrot VM: PMC_EXT allocation failed!\n");
PObj_is_PMC_EXT_SET(pmc);
+ PObj_is_special_PMC_SET(pmc);
#ifdef PARROT_GC_IMS
/*
Modified: branches/tt761_keys_revamp/src/hash.c
==============================================================================
--- branches/tt761_keys_revamp/src/hash.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/hash.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -715,13 +715,13 @@
{
ASSERT_ARGS(expand_hash)
HashBucket **old_bi, **new_bi;
- HashBucket *bs, *b;
+ HashBucket *bs, *b, *new_mem;
+ HashBucket *old_offset = (HashBucket *)((char *)hash + sizeof (Hash));
- void * const old_mem = hash->bs;
- HashBucket *old_offset = (HashBucket*)((char*)hash + sizeof (Hash));
- const UINTVAL old_size = hash->mask + 1;
- const UINTVAL new_size = old_size << 1;
- const UINTVAL old_nb = N_BUCKETS(old_size);
+ void * const old_mem = hash->bs;
+ const UINTVAL old_size = hash->mask + 1;
+ const UINTVAL new_size = old_size << 1;
+ const UINTVAL old_nb = N_BUCKETS(old_size);
size_t offset, i, new_loc;
/*
@@ -736,7 +736,6 @@
*/
/* resize mem */
- HashBucket *new_mem;
if (old_offset != old_mem) {
/* This buffer has been reallocated at least once before. */
new_mem = (HashBucket *)mem_sys_realloc(old_mem, HASH_ALLOC_SIZE(new_size));
@@ -755,11 +754,11 @@
| new_mem | hash->bi
*/
bs = new_mem;
- old_bi = (HashBucket**) (bs + old_nb);
- new_bi = (HashBucket**) (bs + N_BUCKETS(new_size));
+ old_bi = (HashBucket **)(bs + old_nb);
+ new_bi = (HashBucket **)(bs + N_BUCKETS(new_size));
/* things can have moved by this offset */
- offset = (char*)new_mem - (char*)old_mem;
+ offset = (char *)new_mem - (char *)old_mem;
/* relocate the bucket index */
mem_sys_memmove(new_bi, old_bi, old_size * sizeof (HashBucket *));
@@ -770,7 +769,7 @@
hash->mask = new_size - 1;
/* clear freshly allocated bucket index */
- memset(new_bi + old_size, 0, sizeof (HashBucket *) * old_size);
+ memset(new_bi + old_size, 0, sizeof (HashBucket *) * (new_size - old_size));
/*
* reloc pointers - this part would be also needed, if we
@@ -810,12 +809,11 @@
/* add new buckets to free_list in reverse order
* lowest bucket is top on free list and will be used first */
- for (i = 0, b = (HashBucket*)new_bi - 1; i < old_nb; ++i, --b) {
+ for (i = 0, b = (HashBucket *)new_bi - 1; i < old_nb; ++i, --b) {
b->next = hash->free_list;
b->key = b->value = NULL;
hash->free_list = b;
}
-
}
@@ -982,7 +980,7 @@
* - use the bucket store and bi inside this structure
* - when reallocate copy this part
*/
- bp = (HashBucket *)((char*)alloc + sizeof (Hash));
+ bp = (HashBucket *)((char *)alloc + sizeof (Hash));
hash->free_list = NULL;
/* fill free_list from hi addresses so that we can use
Modified: branches/tt761_keys_revamp/src/io/socket_api.c
==============================================================================
--- branches/tt761_keys_revamp/src/io/socket_api.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/io/socket_api.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -150,7 +150,7 @@
/*
-=item C<INTVAL Parrot_io_socket(PARROT_INTERP, PMC * socket, INTVAL fam, INTVAL
+=item C<INTVAL Parrot_io_socket(PARROT_INTERP, PMC *socket, INTVAL fam, INTVAL
type, INTVAL proto)>
Creates and returns a socket using the specified address family, socket type,
@@ -165,7 +165,7 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
INTVAL
-Parrot_io_socket(PARROT_INTERP, ARGMOD_NULLOK(PMC * socket), INTVAL fam,
+Parrot_io_socket(PARROT_INTERP, ARGMOD_NULLOK(PMC *socket), INTVAL fam,
INTVAL type, INTVAL proto)
{
ASSERT_ARGS(Parrot_io_socket)
Modified: branches/tt761_keys_revamp/src/io/socket_unix.c
==============================================================================
--- branches/tt761_keys_revamp/src/io/socket_unix.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/io/socket_unix.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -100,11 +100,10 @@
Parrot_io_sockaddr_in(PARROT_INTERP, ARGIN(STRING *addr), INTVAL port)
{
ASSERT_ARGS(Parrot_io_sockaddr_in)
- PMC * sockaddr;
- char * s;
- s = Parrot_str_to_cstring(interp, addr);
- sockaddr = pmc_new(interp, enum_class_Sockaddr);
+ char * const s = Parrot_str_to_cstring(interp, addr);
+ PMC * const sockaddr = pmc_new(interp, enum_class_Sockaddr);
+
get_sockaddr_in(interp, sockaddr, s, port);
free(s);
return sockaddr;
@@ -131,9 +130,9 @@
Parrot_io_socket_unix(PARROT_INTERP, ARGIN(PMC *s), int fam, int type, int proto)
{
ASSERT_ARGS(Parrot_io_socket_unix)
- int sock, i = 1;
- sock = socket(fam, type, proto);
+ const int sock = socket(fam, type, proto);
if (sock >= 0) {
+ int i = 1;
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof (i));
Parrot_io_set_os_handle(interp, s, sock);
SOCKADDR_REMOTE(s)->sin_family = fam;
@@ -156,7 +155,7 @@
Parrot_io_connect_unix(PARROT_INTERP, ARGMOD(PMC *socket), ARGIN(PMC *r))
{
ASSERT_ARGS(Parrot_io_connect_unix)
- Parrot_Socket_attributes * io = PARROT_SOCKET(socket);
+ const Parrot_Socket_attributes * const io = PARROT_SOCKET(socket);
if (!r)
return -1;
@@ -195,7 +194,7 @@
Parrot_io_bind_unix(PARROT_INTERP, ARGMOD(PMC *socket), ARGMOD(PMC *sockaddr))
{
ASSERT_ARGS(Parrot_io_bind_unix)
- Parrot_Socket_attributes * io = PARROT_SOCKET(socket);
+ const Parrot_Socket_attributes * const io = PARROT_SOCKET(socket);
struct sockaddr_in * saddr;
if (!sockaddr)
@@ -228,7 +227,7 @@
Parrot_io_listen_unix(SHIM_INTERP, ARGMOD(PMC *socket), INTVAL sec)
{
ASSERT_ARGS(Parrot_io_listen_unix)
- Parrot_Socket_attributes * io = PARROT_SOCKET(socket);
+ const Parrot_Socket_attributes * const io = PARROT_SOCKET(socket);
if ((listen(io->os_handle, sec)) == -1) {
return -1;
}
@@ -412,7 +411,7 @@
ASSERT_ARGS(Parrot_io_poll_unix)
fd_set r, w, e;
struct timeval t;
- Parrot_Socket_attributes * io = PARROT_SOCKET(socket);
+ const Parrot_Socket_attributes * const io = PARROT_SOCKET(socket);
t.tv_sec = sec;
t.tv_usec = usec;
@@ -454,11 +453,10 @@
int port)
{
ASSERT_ARGS(get_sockaddr_in)
- struct sockaddr_in *sa;
/* Hard coded to IPv4 for now */
const int family = AF_INET;
- sa = (struct sockaddr_in*)VTABLE_get_pointer(interp, sockaddr);
+ struct sockaddr_in * const sa = (struct sockaddr_in*)VTABLE_get_pointer(interp, sockaddr);
# ifdef PARROT_DEF_INET_ATON
if (inet_aton(host, &sa->sin_addr) != 0) {
# else
Modified: branches/tt761_keys_revamp/src/io/unix.c
==============================================================================
--- branches/tt761_keys_revamp/src/io/unix.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/io/unix.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -716,11 +716,12 @@
else /* (pid == 0) */ {
/* Child - exec process */
char * argv[4];
- /* C strings for the execv call defined that way to avoid
+ /* C strings for the execv call defined without const to avoid
* const problems without copying them.
+ * Please don't change this without testing with a c++ compiler.
*/
- static const char auxarg0[] = "/bin/sh";
- static const char auxarg1[] = "-c";
+ static char auxarg0[] = "/bin/sh";
+ static char auxarg1[] = "-c";
if (f_write) {
/* the other end is writing - we read from the pipe */
Modified: branches/tt761_keys_revamp/src/library.c
==============================================================================
--- branches/tt761_keys_revamp/src/library.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/library.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -229,12 +229,12 @@
PARROT_LIB_PATH_DYNEXT, paths);
entry = CONST_STRING(interp, "runtime/parrot/dynext/");
VTABLE_push_string(interp, paths, entry);
+ entry = CONST_STRING(interp, "dynext/");
+ VTABLE_push_string(interp, paths, entry);
if (!STRING_IS_NULL(versionlib)) {
entry = Parrot_str_concat(interp, versionlib, CONST_STRING(interp, "/dynext/"), 0);
VTABLE_push_string(interp, paths, entry);
}
- entry = CONST_STRING(interp, "dynext/");
- VTABLE_push_string(interp, paths, entry);
/* shared exts */
paths = pmc_new(interp, enum_class_ResizableStringArray);
Modified: branches/tt761_keys_revamp/src/list.c
==============================================================================
--- branches/tt761_keys_revamp/src/list.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/list.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -191,9 +191,17 @@
PARROT_IGNORABLE_RESULT
PARROT_CANNOT_RETURN_NULL
-static List_chunk * add_chunk(PARROT_INTERP,
+static List_chunk * add_chunk_at_end(PARROT_INTERP,
+ ARGMOD(List *list),
+ UINTVAL idx)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ FUNC_MODIFIES(*list);
+
+PARROT_IGNORABLE_RESULT
+PARROT_CANNOT_RETURN_NULL
+static List_chunk * add_chunk_at_start(PARROT_INTERP,
ARGMOD(List *list),
- int where,
UINTVAL idx)
__attribute__nonnull__(1)
__attribute__nonnull__(2)
@@ -289,7 +297,10 @@
FUNC_MODIFIES(*list)
FUNC_MODIFIES(*chunk);
-#define ASSERT_ARGS_add_chunk __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_add_chunk_at_end __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(list)
+#define ASSERT_ARGS_add_chunk_at_start __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(list)
#define ASSERT_ARGS_alloc_next_size __attribute__unused__ int _ASSERT_ARGS_CHECK = \
@@ -818,11 +829,10 @@
/*
-=item C<static List_chunk * add_chunk(PARROT_INTERP, List *list, int where,
+=item C<static List_chunk * add_chunk_at_start(PARROT_INTERP, List *list,
UINTVAL idx)>
-Adds a new chunk to the C<list>. If C<where> is 0, the chunk is added to
-the front of the list. If 0, it is added to the end of the list.
+Adds a new chunk to the start of C<list>.
=cut
@@ -831,27 +841,51 @@
PARROT_IGNORABLE_RESULT
PARROT_CANNOT_RETURN_NULL
static List_chunk *
-add_chunk(PARROT_INTERP, ARGMOD(List *list), int where, UINTVAL idx)
+add_chunk_at_start(PARROT_INTERP, ARGMOD(List *list), UINTVAL idx)
{
- ASSERT_ARGS(add_chunk)
- List_chunk * const chunk = where ? list->last : list->first;
- List_chunk * const new_chunk = alloc_next_size(interp, list, where, idx);
-
- if (where) { /* at end */
- if (chunk)
- chunk->next = new_chunk;
- if (!list->first)
- list->first = new_chunk;
+ ASSERT_ARGS(add_chunk_at_start)
+ List_chunk * const chunk = list->first;
+ List_chunk * const new_chunk = alloc_next_size(interp, list, enum_add_at_start, idx);
+
+ new_chunk->next = chunk;
+ list->first = new_chunk;
+ if (!list->last)
list->last = new_chunk;
- }
- else {
- new_chunk->next = chunk;
- list->first = new_chunk;
- if (!list->last)
- list->last = new_chunk;
- }
+ rebuild_chunk_list(interp, list);
+
+ return new_chunk;
+}
+
+
+/*
+
+=item C<static List_chunk * add_chunk_at_end(PARROT_INTERP, List *list, UINTVAL
+idx)>
+
+Adds a new chunk to the end of C<list>.
+
+=cut
+
+*/
+
+PARROT_IGNORABLE_RESULT
+PARROT_CANNOT_RETURN_NULL
+static List_chunk *
+add_chunk_at_end(PARROT_INTERP, ARGMOD(List *list), UINTVAL idx)
+{
+ ASSERT_ARGS(add_chunk_at_end)
+ List_chunk * const chunk = list->last;
+ List_chunk * const new_chunk = alloc_next_size(interp, list, enum_add_at_end, idx);
+
+ if (chunk)
+ chunk->next = new_chunk;
+
+ if (!list->first)
+ list->first = new_chunk;
+
+ list->last = new_chunk;
rebuild_chunk_list(interp, list);
@@ -1300,13 +1334,13 @@
ASSERT_ARGS(list_append)
/* initially, list may be empty, also used by assign */
while (idx >= list->cap)
- add_chunk(interp, list, enum_add_at_end, idx);
+ add_chunk_at_end(interp, list, idx);
list_set(interp, list, item, type, idx);
/* invariant: prepare for next push */
if (idx >= list->cap - 1)
- add_chunk(interp, list, enum_add_at_end, 0);
+ add_chunk_at_end(interp, list, 0);
}
@@ -1713,8 +1747,7 @@
/* assume user will fill it, so don't generate sparse chunks */
if (!list->cap && idx > MAX_ITEMS) {
while (idx - MAX_ITEMS >= list->cap) {
- add_chunk(interp, list, enum_add_at_end,
- list->cap + MAX_ITEMS);
+ add_chunk_at_end(interp, list, list->cap + MAX_ITEMS);
}
}
@@ -1758,7 +1791,7 @@
list->length = idx;
while (idx >= (INTVAL)list->cap)
- add_chunk(interp, list, enum_add_at_end, idx);
+ add_chunk_at_end(interp, list, idx);
return;
}
@@ -1947,7 +1980,7 @@
List_chunk *chunk;
if (list->start == 0) {
- chunk = add_chunk(interp, list, enum_add_at_start, 0);
+ chunk = add_chunk_at_start(interp, list, 0);
list->start = chunk->items;
}
@@ -2128,7 +2161,7 @@
PARROT_EXPORT
void
-list_splice(PARROT_INTERP, ARGMOD(List *list), ARGIN_NULLOK(List *value_list),
+list_splice(PARROT_INTERP, ARGMOD(List *list), ARGMOD_NULLOK(List *value_list),
INTVAL offset, INTVAL count)
{
ASSERT_ARGS(list_splice)
Deleted: branches/tt761_keys_revamp/src/ops/obscure.ops
==============================================================================
--- branches/tt761_keys_revamp/src/ops/obscure.ops Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,115 +0,0 @@
-/*
- * $Id$
-** obscure.ops
-*/
-
-#include <math.h>
-
-VERSION = PARROT_VERSION;
-
-=head1 NAME
-
-obscure.ops - Obscure Mathmatical Opcodes
-
-=cut
-
-=head1 DESCRIPTION
-
-Parrot's library of obscure ops.
-
-=cut
-
-
-###############################################################################
-
-=head2 Obscure trigonometric operations
-
-Reference:
-
- Abramowitz, M. and Stegum, C. A. (Eds.). Handbook of Mathematical
- Functions with Formulas, Graphs, and Mathematical Tables, 9th printing.
- New York: Dover, p. 78, 1972.
-
-=over 4
-
-=cut
-
-
-########################################
-
-=item B<covers>(out NUM, in NUM)
-
-Set $1 to the coversine (in radians) of $2.
-
-=cut
-
-inline op covers(out NUM, in NUM) :advanced_math {
- $1 = 1.0 - sin($2);
-}
-
-
-########################################
-
-=item B<exsec>(out NUM, in NUM)
-
-Set $1 to the exsecant of $2 (given in radians).
-
-=cut
-
-
-inline op exsec(out NUM, in NUM) :advanced_math {
- $1 = (1.0 / cos($2)) - 1.0;
-}
-
-
-########################################
-
-=item B<hav>(out NUM, in NUM)
-
-Set $1 to the haversine (in radians) of $2.
-
-=cut
-
-inline op hav(out NUM, in NUM) {
- $1 = 0.5 * (1.0 - cos($2));
-}
-
-
-########################################
-
-=item B<vers>(out NUM, in NUM)
-
-Set $1 to the versine (in radians) of $2.
-
-=cut
-
-inline op vers(out NUM, in NUM) :advanced_math {
- $1 = 1.0 - cos($2);
-}
-
-
-=back
-
-=cut
-
-
-###############################################################################
-
-=head1 COPYRIGHT
-
-Copyright (C) 2001-2008, Parrot Foundation.
-
-=head1 LICENSE
-
-This program is free software. It is subject to the same license
-as the Parrot interpreter itself.
-
-=cut
-
-
-/*
- * Local variables:
- * c-file-style: "parrot"
- * End:
- * vim: expandtab shiftwidth=4:
- */
Modified: branches/tt761_keys_revamp/src/pmc/class.pmc
==============================================================================
--- branches/tt761_keys_revamp/src/pmc/class.pmc Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/pmc/class.pmc Fri Jul 10 22:11:09 2009 (r39981)
@@ -1305,10 +1305,6 @@
/* Check if the passed name is the same as the stored short name. */
INTVAL name_match = Parrot_str_equal(interp, classname, self_name);
- Parrot_str_free(interp, classname);
- if (is_proxy)
- Parrot_str_free(interp, self_name);
-
if (name_match)
return 1;
}
Modified: branches/tt761_keys_revamp/src/pmc/exceptionhandler.pmc
==============================================================================
--- branches/tt761_keys_revamp/src/pmc/exceptionhandler.pmc Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/pmc/exceptionhandler.pmc Fri Jul 10 22:11:09 2009 (r39981)
@@ -76,6 +76,7 @@
Parrot_gc_mark_PObj_alive(interp, (PObj *)core_struct->handled_types);
if (core_struct->handled_types_except)
Parrot_gc_mark_PObj_alive(interp, (PObj *)core_struct->handled_types_except);
+ SUPER();
}
VTABLE PMC *clone() {
Modified: branches/tt761_keys_revamp/src/pmc/sub.pmc
==============================================================================
--- branches/tt761_keys_revamp/src/pmc/sub.pmc Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/pmc/sub.pmc Fri Jul 10 22:11:09 2009 (r39981)
@@ -222,7 +222,6 @@
Parrot_sub *sub;
Parrot_Context *caller_ctx;
Parrot_Context *context;
- Parrot_Context *c;
PMC *ccont;
opcode_t *pc;
@@ -318,6 +317,7 @@
}
else {
/* autoclose */
+ Parrot_Context *c;
for (c = context; !c->outer_ctx; c = c->outer_ctx) {
PMC *outer_pmc;
@@ -765,7 +765,7 @@
/* If the argument info hasn't been generated yet, generate it. */
if (!sub->arg_info) {
/* Get pointer into the bytecode where this sub starts. */
- opcode_t *pc = sub->seg->base.data + sub->start_offs;
+ const opcode_t *pc = sub->seg->base.data + sub->start_offs;
/* Allocate structure to store argument information in. */
sub->arg_info = mem_allocate_zeroed_typed(Parrot_sub_arginfo);
Modified: branches/tt761_keys_revamp/src/runcore/trace.c
==============================================================================
--- branches/tt761_keys_revamp/src/runcore/trace.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/runcore/trace.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -161,9 +161,7 @@
Parrot_io_eprintf(debugger, "Complex=PMC(%#p: %Ss)",
pmc, s);
}
- else if (pmc->vtable->base_type == enum_class_RetContinuation
- || pmc->vtable->base_type == enum_class_Continuation
- || pmc->vtable->base_type == enum_class_Sub) {
+ else if (pmc->vtable->base_type == enum_class_Sub) {
PMC_get_sub(interp, pmc, sub);
Parrot_io_eprintf(debugger, "%S=PMC(%#p pc:%d)",
VTABLE_name(interp, pmc), pmc, sub->start_offs);
Modified: branches/tt761_keys_revamp/src/scheduler.c
==============================================================================
--- branches/tt761_keys_revamp/src/scheduler.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/scheduler.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -1005,7 +1005,7 @@
Parrot_cx_schedule_sleep(PARROT_INTERP, FLOATVAL time, ARGIN_NULLOK(opcode_t *next))
{
ASSERT_ARGS(Parrot_cx_schedule_sleep)
-#if PARROT_HAS_THREADS
+#ifdef PARROT_HAS_THREADS
Parrot_cond condition;
Parrot_mutex lock;
const FLOATVAL timer_end = time + Parrot_floatval_time();
Modified: branches/tt761_keys_revamp/src/spf_render.c
==============================================================================
--- branches/tt761_keys_revamp/src/spf_render.c Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/src/spf_render.c Fri Jul 10 22:11:09 2009 (r39981)
@@ -180,11 +180,10 @@
Parrot_str_chopn_inplace(interp, str, len);
len = 0;
}
- else
- if (info->flags & FLAG_PREC && info->prec < len) {
- Parrot_str_chopn_inplace(interp, str, -(INTVAL)(info->prec));
- len = info->prec;
- }
+ else if (info->flags & FLAG_PREC && info->prec < len) {
+ Parrot_str_chopn_inplace(interp, str, -(INTVAL)(info->prec));
+ len = info->prec;
+ }
}
if ((info->flags & FLAG_WIDTH) && info->width > len) {
@@ -259,51 +258,53 @@
gen_sprintf_call(ARGOUT(char *out), ARGMOD(SpfInfo *info), int thingy)
{
ASSERT_ARGS(gen_sprintf_call)
- int i = 0;
- out[i++] = '%';
- if (info->flags) {
- if (info->flags & FLAG_MINUS)
- out[i++] = '-';
+ const int flags = info->flags;
+ char *p = out;
+ *p++ = '%';
- if (info->flags & FLAG_PLUS)
- out[i++] = '+';
+ if (flags) {
+ if (flags & FLAG_MINUS)
+ *p++ = '-';
- if (info->flags & FLAG_ZERO)
- out[i++] = '0';
+ if (flags & FLAG_PLUS)
+ *p++ = '+';
- if (info->flags & FLAG_SPACE)
- out[i++] = ' ';
+ if (flags & FLAG_ZERO)
+ *p++ = '0';
- if (info->flags & FLAG_SHARP)
- out[i++] = '#';
- }
+ if (flags & FLAG_SPACE)
+ *p++ = ' ';
- if (info->flags & FLAG_WIDTH) {
- if (info->width > PARROT_SPRINTF_BUFFER_SIZE - 1)
- info->width = PARROT_SPRINTF_BUFFER_SIZE;
+ if (flags & FLAG_SHARP)
+ *p++ = '#';
- i += sprintf(out + i, "%u", (unsigned)info->width);
- }
+ if (flags & FLAG_WIDTH) {
+ if (info->width > PARROT_SPRINTF_BUFFER_SIZE - 1)
+ info->width = PARROT_SPRINTF_BUFFER_SIZE;
- if (info->flags & FLAG_PREC) {
- if (info->prec > PARROT_SPRINTF_MAX_PREC)
- info->prec = PARROT_SPRINTF_MAX_PREC;
+ p += sprintf(p, "%u", (unsigned)info->width);
+ }
+
+ if (flags & FLAG_PREC) {
+ if (info->prec > PARROT_SPRINTF_MAX_PREC)
+ info->prec = PARROT_SPRINTF_MAX_PREC;
- out[i++] = '.';
- i += sprintf(out + i, "%u", (unsigned)info->prec);
+ *p++ = '.';
+ p += sprintf(p, "%u", (unsigned)info->prec);
+ }
}
if (thingy == 'd' || thingy == 'i' ||thingy == 'u') {
/* the u?int isa HUGEU?INTVAL aka long long
* the 'll' modifier is specced in susv3 - hopefully all our
* compilers support it too */
- out[i++] = 'l';
- out[i++] = 'l';
+ *p++ = 'l';
+ *p++ = 'l';
}
- out[i++] = (char)thingy;
- out[i] = '\0';
+ *p++ = (char)thingy;
+ *p = '\0';
}
@@ -332,7 +333,7 @@
HUGEINTVAL num;
/* start with a buffer; double the pattern length to avoid realloc #1 */
- STRING *targ = Parrot_str_new_noinit(interp, enum_stringrep_one, pat_len << 1);
+ STRING *targ = Parrot_str_new_noinit(interp, enum_stringrep_one, pat_len * 2);
/* ts is used almost universally as an intermediate target;
* tc is used as a temporary buffer by Parrot_str_from_uint and
@@ -831,8 +832,8 @@
((PMC *)obj->data),
(obj->index));
- STRING *string = (VTABLE_get_repr(interp, tmp));
- STRING *ts = handle_flags(interp, &info,
+ STRING * const string = (VTABLE_get_repr(interp, tmp));
+ STRING * const ts = handle_flags(interp, &info,
string, 0, NULL);
obj->index++;
Modified: branches/tt761_keys_revamp/t/codingstd/c_indent.t
==============================================================================
--- branches/tt761_keys_revamp/t/codingstd/c_indent.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/codingstd/c_indent.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -61,7 +61,6 @@
foreach my $line (@source) {
$state{line_cnt}++;
chomp $line;
-# dump_state(\%state, $line);
next unless $line;
$state{prev_last_char} = $state{last_char};
@@ -70,11 +69,11 @@
# ignore multi-line comments (except the first line)
$state{in_comment} = 0, next if $state{in_comment} &&
$line =~ m{\*/} &&
- $' !~ m{/\*};
+ $' !~ m{/\*}; #'
next if $state{in_comment};
$state{in_comment} = 1
if $line =~ m{/\*} &&
- $' !~ m{\*/};
+ $' !~ m{\*/}; #'
## preprocessor scan
if ( $line =~ m/^\s*\#(\s*)(ifndef|ifdef|if)\s+(.*)/ )
@@ -184,8 +183,8 @@
my ($indent) = $line =~ /^(\s+)/ or next;
$indent = length($indent);
- # Ignore the indentation of the current line if that
- # previous line's last character was anything but a ;.
+ # Ignore the indentation of the current line if the last
+ # character of the was anything but a ';'.
#
# The indentation of the previous line is not considered.
# Check sanity by verifying that the indentation of the current line
Modified: branches/tt761_keys_revamp/t/codingstd/test_file_coverage.t
==============================================================================
--- branches/tt761_keys_revamp/t/codingstd/test_file_coverage.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/codingstd/test_file_coverage.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -62,8 +62,11 @@
or diag "files in $dynpmc_dir but not in test dir:\n\t@$test_dynpmc_miss";
# Tests in src/dynoplibs
+ {
+ local $TODO = "obscure.ops needs tests. (TT #819)";
ok( !@$test_dynoplibs_miss, "there are test files in $test_dynoplibs_dir for all OPS files" )
or diag "files in $dynoplibs_dir but not in test dir:\n\t@$test_dynoplibs_miss";
+ }
} # PMC
# remember to change the number of tests :-)
Modified: branches/tt761_keys_revamp/t/configure/017-revision_from_cache.t
==============================================================================
--- branches/tt761_keys_revamp/t/configure/017-revision_from_cache.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/configure/017-revision_from_cache.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -41,10 +41,10 @@
my $tdir = tempdir( CLEANUP => 1 );
ok( chdir $tdir, "Changed to temporary directory for testing" );
my $libdir = qq{$tdir/lib};
- ok( (File::Path::mkpath( $libdir )), "Able to make libdir");
+ ok( (File::Path::mkpath( [ $libdir ], 0, 0777 )), "Able to make libdir");
local @INC;
unshift @INC, $libdir;
- ok( (File::Path::mkpath( qq{$libdir/Parrot} )), "Able to make Parrot dir");
+ ok( (File::Path::mkpath( [ qq{$libdir/Parrot} ], 0, 0777 )), "Able to make Parrot dir");
ok( (copy qq{$cwd/lib/Parrot/Revision.pm},
qq{$libdir/Parrot}), "Able to copy Parrot::Revision");
my $cache = q{.parrot_current_rev};
Modified: branches/tt761_keys_revamp/t/configure/018-revision_to_cache.t
==============================================================================
--- branches/tt761_keys_revamp/t/configure/018-revision_to_cache.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/configure/018-revision_to_cache.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -23,10 +23,10 @@
my $tdir = tempdir( CLEANUP => 1 );
ok( chdir $tdir, "Changed to temporary directory for testing" );
my $libdir = qq{$tdir/lib};
- ok( (File::Path::mkpath( $libdir )), "Able to make libdir");
+ ok( (File::Path::mkpath( [ $libdir ], 0, 0777 )), "Able to make libdir");
local @INC;
unshift @INC, $libdir;
- ok( (File::Path::mkpath( qq{$libdir/Parrot} )), "Able to make Parrot dir");
+ ok( (File::Path::mkpath( [ qq{$libdir/Parrot} ], 0, 0777 )), "Able to make Parrot dir");
ok( (copy qq{$cwd/lib/Parrot/Revision.pm},
qq{$libdir/Parrot}), "Able to copy Parrot::Revision");
require Parrot::Revision;
Deleted: branches/tt761_keys_revamp/t/configure/049-options_test.t
==============================================================================
--- branches/tt761_keys_revamp/t/configure/049-options_test.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,138 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# 049-options_test.t
-
-use strict;
-use warnings;
-use Carp;
-use Cwd;
-use File::Basename;
-use File::Temp 0.13 qw| tempdir |;
-use Test::More tests => 12;
-use lib qw( lib );
-use IO::CaptureOutput qw| capture |;
-use Parrot::Configure::Options::Test::Prepare ();
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $good_test = q{001-sometest.t};
- my $bad_test = q{someothertest.t};
- touch($good_test);
- touch($bad_test);
- my %tests_seen = map { basename($_), 1 }
- Parrot::Configure::Options::Test::Prepare::_get_framework_tests($tdir);
- ok($tests_seen{$good_test},
- "Correctly named test identified");
- ok(! $tests_seen{$bad_test},
- "Incorrectly named test excluded");
-
- ok( chdir $cwd, "Able to change back to starting directory");
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $init_test = q{init_sometest-01.t};
- my $inter_test = q{inter_sometest-01.t};
- my $auto_test = q{auto_sometest-01.t};
- my $gen_test = q{gen_sometest-01.t};
- my $bad_test = q{bad_sometest-01.t};
- my $lack_number_test = q{init_test.t};
- touch($init_test);
- touch($inter_test);
- touch($auto_test);
- touch($gen_test);
- touch($bad_test);
- touch($lack_number_test);
- my $steps_tests_ref = {};
- {
- my ($stdout, $stderr);
- capture (
- sub { $steps_tests_ref =
- Parrot::Configure::Options::Test::Prepare::_get_steps_tests(
- $tdir
- ) },
- \$stdout,
- \$stderr,
- );
- like($stderr, qr/Unable to match $bad_test/,
- "Warning about badly named test captured");
- like($stderr, qr/Unable to match $lack_number_test/,
- "Warning about badly named test captured");
- }
-
- my @tests_expected = qw(
- init::sometest
- inter::sometest
- auto::sometest
- gen::sometest
- gen::missing
- );
- my %tests_seen = ();
- {
- my ($stdout, $stderr);
- capture (
- sub { %tests_seen = map { basename($_), 1}
- Parrot::Configure::Options::Test::Prepare::_prepare_steps_tests_list(
- $tdir,
- $steps_tests_ref,
- \@tests_expected,
- ) },
- \$stdout,
- \$stderr,
- );
- like($stderr, qr/No tests exist for configure step gen::missing/,
- "Warning about step class lacking test test captured");
- }
- foreach my $type ( qw| init inter auto gen | ) {
- my $t = $type . q(_sometest-01.t);
- ok($tests_seen{$t}, "Found needed test");
- }
-
- ok( chdir $cwd, "Able to change back to starting directory");
-}
-
-pass("Completed all tests in $0");
-
-sub touch {
- my $file = shift;
- open my $FH, '>', $file or croak "Unable to open $file for writing";
- print $FH "Hello, world\n";
- close $FH or croak "Unable to close $file after writing";
-}
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-049-options_test.t - test Parrot::Configure::Options::Test
-
-=head1 SYNOPSIS
-
- % prove t/configure/049-options_test.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test Parrot::Configure::Options::Test methods.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-Parrot::Configure::Options, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Added: branches/tt761_keys_revamp/t/configure/049-options_test_prepare.t
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/tt761_keys_revamp/t/configure/049-options_test_prepare.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -0,0 +1,160 @@
+#! perl
+# Copyright (C) 2007, Parrot Foundation.
+# $Id$
+# 049-options_test_prepare.t
+
+use strict;
+use warnings;
+use Carp;
+use Cwd;
+use File::Basename qw( basename fileparse );
+use File::Path qw( mkpath );
+use File::Spec ();
+use File::Temp 0.13 qw| tempdir |;
+use Test::More tests => 10;
+use lib qw( lib );
+use IO::CaptureOutput qw| capture |;
+use Parrot::Configure::Options::Test::Prepare ();
+
+my $cwd = cwd();
+{
+ my $tdir = tempdir( CLEANUP => 1 );
+ chdir $tdir or croak "Unable to change to temporary directory";
+ my $good_test = q{001-sometest.t};
+ my $bad_test = q{someothertest.t};
+ touch_in_this_dir($good_test);
+ touch_in_this_dir($bad_test);
+ my %tests_seen = map { basename($_), 1 }
+ Parrot::Configure::Options::Test::Prepare::_get_framework_tests($tdir);
+ ok($tests_seen{$good_test},
+ "Correctly named test identified");
+ ok(! $tests_seen{$bad_test},
+ "Incorrectly named test excluded");
+
+ ok( chdir $cwd, "Able to change back to starting directory");
+}
+
+{
+ my $tdir = tempdir( CLEANUP => 1 );
+ chdir $tdir or croak "Unable to change to temporary directory";
+ my $init_test = q{init/sometest-01.t};
+ my $init_hints_test = q{init/hints/sometest-01.t};
+ my $inter_test = q{inter/sometest-01.t};
+ my $auto_test = q{auto/sometest-01.t};
+ my $gen_test = q{gen/sometest-01.t};
+ my $bad_test = q{bad/sometest-01.t};
+ my $lack_number_test = q{init/test.t};
+ my $CamelCase_test = q{gen/CamelCase-01.t};
+ touch($init_test);
+ touch($init_hints_test);
+ touch($inter_test);
+ touch($auto_test);
+ touch($gen_test);
+ touch($bad_test);
+ touch($lack_number_test);
+ touch($CamelCase_test);
+
+ my ( $steps_tests_simple_ref, $steps_tests_complex_ref ) =
+ Parrot::Configure::Options::Test::Prepare::_find_steps_tests($tdir);
+ my $full_bad_test = File::Spec->catfile( $tdir, $bad_test );
+ ok( ! exists $steps_tests_simple_ref->{$full_bad_test},
+ "File in incorrect directory correctly excluded from list of configuration step tests");
+ my $full_lack_number_test = File::Spec->catfile( $tdir, $lack_number_test );
+ ok( ! exists $steps_tests_simple_ref->{$full_lack_number_test},
+ "File lacking 2-digit number correctly excluded from list of configuration step tests");
+ my $full_init_hints_test = File::Spec->catfile( $tdir, $init_hints_test );
+ ok( exists $steps_tests_simple_ref->{$full_init_hints_test},
+ "File in second-level directory correctly included in list of configuration step tests");
+ my $full_CamelCase_test = File::Spec->catfile( $tdir, $CamelCase_test );
+ ok( ! exists $steps_tests_simple_ref->{$full_CamelCase_test},
+ "File containing capital letters in name correctly excluded from list of configuration step tests");
+
+ my @tests_expected = qw(
+ init::sometest
+ init::hints::sometest
+ inter::sometest
+ auto::sometest
+ gen::sometest
+ );
+ my $not_expected = q{gen::missing};
+ push @tests_expected, $not_expected;
+ my %tests_seen = ();
+ {
+ my ($stdout, $stderr);
+ capture (
+ sub { %tests_seen = map { $_, 1}
+ Parrot::Configure::Options::Test::Prepare::_prepare_steps_tests_list(
+ $tdir,
+ $steps_tests_complex_ref,
+ \@tests_expected,
+ ) },
+ \$stdout,
+ \$stderr,
+ );
+ like($stderr, qr/No tests exist for configure step $not_expected/,
+ "Warning about step class lacking test captured");
+ }
+# foreach my $type ( qw| init inter auto gen | ) {
+# my $t = $type . q(_sometest-01.t);
+# ok($tests_seen{$t}, "Found needed test");
+# }
+
+ ok( chdir $cwd, "Able to change back to starting directory");
+}
+
+pass("Completed all tests in $0");
+
+sub touch {
+ my $path = shift;
+ my ($base, $dirs) = fileparse($path);
+ my $cwd = cwd();
+ unless ( -d $dirs ) {
+ mkpath( [ $dirs ], 0, 0777 ) or croak "Unable to create dirs: $!";
+ }
+ chdir $dirs or croak "Unable to change dir: $!";
+ touch_in_this_dir( $base );
+ chdir $cwd or croak "Unable to change back dir: $!";
+ ( -e $path ) or croak "Didn't create file: $!";
+}
+
+sub touch_in_this_dir {
+ my $file = shift;
+ open my $FH, '>', $file or croak "Unable to open $file for writing";
+ print $FH "Hello, world\n";
+ close $FH or croak "Unable to close $file after writing";
+}
+
+################### DOCUMENTATION ###################
+
+=head1 NAME
+
+049-options_test_prepare.t - test Parrot::Configure::Options::Test
+
+=head1 SYNOPSIS
+
+ % prove t/configure/049-options_test_prepare.t
+
+=head1 DESCRIPTION
+
+The files in this directory test functionality used by F<Configure.pl>.
+
+The tests in this file test Parrot::Configure::Options::Test::Prepare
+subroutines.
+
+=head1 AUTHOR
+
+James E Keenan
+
+=head1 SEE ALSO
+
+Parrot::Configure::Options::Test, F<Configure.pl>.
+
+=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
+
Modified: branches/tt761_keys_revamp/t/configure/061-revision_from_cache.t
==============================================================================
--- branches/tt761_keys_revamp/t/configure/061-revision_from_cache.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/configure/061-revision_from_cache.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -101,10 +101,10 @@
my $tdir = tempdir( CLEANUP => 1 );
ok( chdir $tdir, "Changed to temporary directory for testing" );
my $libdir = qq{$tdir/lib};
- ok( (File::Path::mkpath( $libdir )), "Able to make libdir");
+ ok( (File::Path::mkpath( [ $libdir ], 0, 0777 )), "Able to make libdir");
local @INC;
unshift @INC, $libdir;
- ok( (File::Path::mkpath( qq{$libdir/Parrot} )), "Able to make Parrot dir");
+ ok( (File::Path::mkpath( [ qq{$libdir/Parrot} ], 0, 0777 )), "Able to make Parrot dir");
ok( (copy qq{$cwd/lib/Parrot/Revision.pm},
qq{$libdir/Parrot}), "Able to copy Parrot::Revision");
my $cache = q{.parrot_current_rev};
Deleted: branches/tt761_keys_revamp/t/dynoplibs/myops.t
==============================================================================
--- branches/tt761_keys_revamp/t/dynoplibs/myops.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,297 +0,0 @@
-#! perl
-# Copyright (C) 2006-2008, Parrot Foundation.
-# $Id$
-
-use strict;
-use warnings;
-use lib qw( . lib ../lib ../../lib );
-use Test::More;
-use Parrot::Test tests => 10;
-use Parrot::Config;
-
-=head1 NAME
-
-t/dynoplibs/myops.t - Test for the ops in src/dynoplibs/myops.ops
-
-=head1 SYNOPSIS
-
- % prove t/dynoplibs/myops.t
-
-=head1 DESCRIPTION
-
-Tests the sample dynamic op library "myops".
-
-=cut
-
-$ENV{TEST_PROG_ARGS} ||= '';
-
-my $is_ms_win32 = $^O =~ m!MSWin32!;
-my $is_mingw = $is_ms_win32
- && grep { $PConfig{cc} =~ /\b$_\b/ } qw(gcc gcc.exe);
-
-pir_output_is( <<'CODE', <<'OUTPUT', 'fortytwo' );
-.loadlib "myops_ops"
-.sub main :main
- $I0 = fortytwo
- print $I0
- print "\n"
-.end
-CODE
-42
-OUTPUT
-
-pir_output_is( << 'CODE', << 'OUTPUT', "what_do_you_get_if_you_multiply_six_by_nine" );
-.loadlib "myops_ops"
-.sub main :main
- $S0 = what_do_you_get_if_you_multiply_six_by_nine
- print $S0
- print "\n"
-.end
-CODE
-fortytwo
-OUTPUT
-
-pir_error_output_like( << 'CODE', << 'OUTPUT', "hcf" );
-.loadlib "myops_ops"
-.sub main :main
- print "neither here\n"
- hcf
- print "nor there\n"
-.end
-CODE
-/neither here
-(?!nor there)/
-OUTPUT
-
-{
- my @todo;
-
- if ( $ENV{TEST_PROG_ARGS} ) {
- @todo = ( todo => 'broken with JIT' ) if $ENV{TEST_PROG_ARGS} =~ /--runcore=jit/;
- }
-
- my $quine = <<'END_PASM';
-.loadlib "myops_ops"
-q
-END_PASM
- pasm_output_is( $quine, $quine, 'a short cheating quine', @todo );
-}
-
- my @todo = $ENV{TEST_PROG_ARGS} =~ /--runcore=jit/ ?
- ( todo => 'RT #49718, add scheduler features to JIT' ) : ();
-
-pir_output_is( << 'CODE', << 'OUTPUT', "one alarm", @todo );
-.loadlib "myops_ops"
-
-.sub main :main
- get_global $P0, "_alarm"
- alarm 0.1, $P0
- print "1\n"
-
- # alarm should be triggered half-way
- # during this sleep
- sleep 1
- sleep 1
- print "2\n"
-
- sleep 1
- print "3\n"
- print "done.\n"
-.end
-
-.sub _alarm
- print "alarm\n"
-.end
-CODE
-1
-alarm
-2
-3
-done.
-OUTPUT
-
-SKIP: {
- skip "three alarms, infinite loop under mingw32", 2 if $is_mingw;
- skip "dynops weird in CGP with events", 2 if $ENV{TEST_PROG_ARGS} =~ /--runcore=cgoto/;
-
- my @todo = $ENV{TEST_PROG_ARGS} =~ /--runcore=jit/ ?
- ( todo => 'RT #49718, add scheduler features to JIT' ) : ();
-
- pir_output_like( << 'CODE', << 'OUTPUT', "three alarm", @todo );
-
-.loadlib "myops_ops"
-.sub main :main
- $P1 = new 'Integer'
- set $P1, 0
- set_global "flag", $P1
- get_global $P0, "_alarm3"
- alarm 0.3, $P0
- get_global $P0, "_alarm2"
- alarm 0.2, $P0
- get_global $P0, "_alarm1"
- alarm 0.1, $P0
-
- set $I0, 1
-loop:
- sleep 0.1
- inc $I0
- # check_events
- get_global $P1, "flag"
- ge $P1, 7, done
- le $I0, 40, loop
-
-done:
- get_global $P1, "flag"
- $I1 = $P1
- print $I1
- print "\n"
-.end
-
-.sub _alarm1
- get_global $P0, "flag"
- add $P0, 1
- set_global "flag", $P0
-.end
-
-.sub _alarm2
- get_global $P0, "flag"
- add $P0, 2
- set_global "flag", $P0
-.end
-
-.sub _alarm3
- get_global $P0, "flag"
- add $P0, 4
- set_global "flag", $P0
-.end
-
-CODE
-/7/
-OUTPUT
-
- pir_output_like( << 'CODE', << 'OUTPUT', "repeating alarm", @todo );
-
-.loadlib "myops_ops"
-.sub main :main
- get_global $P0, "_alarm"
- alarm 0.5, 0.4, $P0
- set $I0, 1
-loop:
- sleep 1
- inc $I0
- # check_events
- le $I0, 4, loop
-.end
-
-.sub _alarm
- print "alarm\n"
-.end
-
-CODE
-/alarm
-alarm
-alarm/
-OUTPUT
-}
-
-# bxand boolean op
-pasm_output_is( <<'CODE', <<'OUTPUT', 'bxand - A AND B, but not BOTH' );
-.loadlib "myops_ops"
-
- bxand I0, 0, 0
- bsr test
- bxand I0, 0, 1
- bsr test
- bxand I0, 1, 0
- bsr test
- bxand I0, 1, 1
- bsr test
-
- branch end
- test:
- eq I0, 1, T
- print "F\n"
- ret
- T:print "T\n"
- ret
- end:
- end
-CODE
-F
-F
-F
-F
-OUTPUT
-
-pasm_output_is( <<'CODE', <<OUTPUT, "conv_u2_i" );
-
-.loadlib "myops_ops"
-
- set I0, 32767
- conv_u2 I0
- print I0
- print "\n"
- inc I0
- conv_u2 I0
- print I0
- print "\n"
- set I0, 65535
- conv_u2 I0
- print I0
- print "\n"
- inc I0
- conv_u2 I0
- print I0
- print "\n"
- dec I0
- conv_u2 I0
- print I0
- print "\n"
- end
-CODE
-32767
-32768
-65535
-0
-65535
-OUTPUT
-
-pasm_output_is( <<'CODE', <<OUTPUT, "conv_i2_i" );
-
-.loadlib "myops_ops"
-
- set I0, 32767 # 2 ^ 15 -1
- conv_i2 I0
- print I0
- print "\n"
- inc I0 # 2 ^ 15
- conv_i2 I0
- print I0
- print "\n"
- set I0, 65535 # 2 ^ 16 -1
- conv_i2 I0
- print I0
- print "\n"
- inc I0 # -1 + 1
- conv_i2 I0
- print I0
- print "\n"
- dec I0 # 0 - 1
- conv_i2 I0
- print I0
- print "\n"
- end
-CODE
-32767
--32768
--1
-0
--1
-OUTPUT
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Modified: branches/tt761_keys_revamp/t/op/cc_state.t
==============================================================================
--- branches/tt761_keys_revamp/t/op/cc_state.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/op/cc_state.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,13 +1,13 @@
#! perl
-# Copyright (C) 2006-2007, Parrot Foundation.
+# Copyright (C) 2006-2009, Parrot Foundation.
# $Id$
use strict;
use warnings;
use lib qw/. lib/;
-use Parrot::Test 'no_plan';
+use Parrot::Test tests => 15;
use Test::More;
## test description key
@@ -53,7 +53,7 @@
## G
pcc_error_like(
{ params => ".param pmc abc" },
- '/too few arguments passed \(0\) - 1 params expected/',
+ '/too few arguments passed \(0\) - 1 param expected/',
'G1: argument underflow: required param',
);
Modified: branches/tt761_keys_revamp/t/pmc/threads.t
==============================================================================
--- branches/tt761_keys_revamp/t/pmc/threads.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/pmc/threads.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -7,6 +7,7 @@
use lib qw( . lib ../lib ../../lib );
use Test::More;
use Parrot::Test;
+use Parrot::Config;
=head1 NAME
@@ -23,21 +24,6 @@
=cut
-my %platforms = map { $_ => 1 } qw/
- aix
- cygwin
- dec_osf
- freebsd
- hpux
- irix
- linux
- netbsd
- openbsd
- solaris
- MSWin32
- darwin
- /;
-
if ( $^O eq "cygwin" ) {
my @uname = split / /, qx'uname -v';
@@ -46,13 +32,11 @@
exit;
}
}
-if ( $platforms{$^O} ) {
+if ( $PConfig{HAS_THREADS} ) {
plan tests => 14;
}
else {
- plan skip_all => "No threading yet or test not enabled for '$^O'";
-
- # plan skip_all => "Needs COPY for argument passing";
+ plan skip_all => "No threading enabled for '$^O'";
}
pasm_output_is( <<'CODE', <<'OUTPUT', "interp identity" );
Modified: branches/tt761_keys_revamp/t/pmc/timer.t
==============================================================================
--- branches/tt761_keys_revamp/t/pmc/timer.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/pmc/timer.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -7,6 +7,7 @@
use lib qw( . lib ../lib ../../lib );
use Test::More;
use Parrot::Test tests => 6;
+use Parrot::Config;
=head1 NAME
@@ -24,19 +25,6 @@
$ENV{TEST_PROG_ARGS} ||= '';
-my %platforms = map { $_ => 1 } qw/
- aix
- cygwin
- darwin
- dec_osf
- freebsd
- hpux
- irix
- linux
- openbsd
- MSWin32
-/;
-
pasm_output_is( <<'CODE', <<'OUT', "Timer setup" );
.include "timer.pasm"
new P0, ['Timer']
@@ -100,7 +88,7 @@
OUT
SKIP: {
- skip( "No thread config yet", 3 ) unless ( $platforms{$^O} );
+ skip( "No thread enabled", 3 ) unless ( $PConfig{HAS_THREADS} );
pasm_output_like( <<'CODE', <<'OUT', "Timer setup - initializer/start" );
.include "timer.pasm"
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/alignptrs-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_alignptrs-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_alignptrs-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/alignptrs-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_alignptrs-01.t
+# auto/alignptrs-01.t
use strict;
use warnings;
@@ -69,11 +69,11 @@
=head1 NAME
-auto_alignptrs-01.t - test auto::alignptrs
+auto/alignptrs-01.t - test auto::alignptrs
=head1 SYNOPSIS
- % prove t/steps/auto_alignptrs-01.t
+ % prove t/steps/auto/alignptrs-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/alignptrs-02.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_alignptrs-02.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_alignptrs-02.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/alignptrs-02.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_alignptrs-02.t
+# auto/alignptrs-02.t
use strict;
use warnings;
@@ -89,11 +89,11 @@
=head1 NAME
-auto_alignptrs-02.t - test auto::alignptrs
+auto/alignptrs-02.t - test auto::alignptrs
=head1 SYNOPSIS
- % prove t/steps/auto_alignptrs-02.t
+ % prove t/steps/auto/alignptrs-02.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/arch-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_arch-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_arch-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/arch-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_arch-01.t
+# auto/arch-01.t
use strict;
use warnings;
@@ -275,11 +275,11 @@
=head1 NAME
-auto_arch-01.t - test auto::arch
+auto/arch-01.t - test auto::arch
=head1 SYNOPSIS
- % prove t/steps/auto_arch-01.t
+ % prove t/steps/auto/arch-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/attributes-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_attributes-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_attributes-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/attributes-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_attributes-01.t
+# auto/attributes-01.t
use strict;
use warnings;
@@ -54,11 +54,11 @@
=head1 NAME
-auto_attributes-01.t - test auto::attributes
+auto/attributes-01.t - test auto::attributes
=head1 SYNOPSIS
- % prove t/steps/auto_attributes-01.t
+ % prove t/steps/auto/attributes-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/backtrace-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_backtrace-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_backtrace-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/backtrace-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_backtrace-01.t
+# auto/backtrace-01.t
use strict;
use warnings;
@@ -64,11 +64,11 @@
=head1 NAME
-auto_backtrace-01.t - test auto::backtrace
+auto/backtrace-01.t - test auto::backtrace
=head1 SYNOPSIS
- % prove t/steps/auto_backtrace-01.t
+ % prove t/steps/auto/backtrace-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/byteorder-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_byteorder-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_byteorder-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/byteorder-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_byteorder-01.t
+# auto/byteorder-01.t
use strict;
use warnings;
@@ -99,11 +99,11 @@
=head1 NAME
-auto_byteorder-01.t - test auto::byteorder
+auto/byteorder-01.t - test auto::byteorder
=head1 SYNOPSIS
- % prove t/steps/auto_byteorder-01.t
+ % prove t/steps/auto/byteorder-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/cgoto-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_cgoto-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_cgoto-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/cgoto-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_cgoto-01.t
+# auto/cgoto-01.t
use strict;
use warnings;
@@ -137,11 +137,11 @@
=head1 NAME
-auto_cgoto-01.t - test auto::cgoto
+auto/cgoto-01.t - test auto::cgoto
=head1 SYNOPSIS
- % prove t/steps/auto_cgoto-01.t
+ % prove t/steps/auto/cgoto-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/cpu-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_cpu-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_cpu-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/cpu-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_cpu-01.t
+# auto/cpu-01.t
use strict;
use warnings;
@@ -74,11 +74,11 @@
=head1 NAME
-auto_cpu-01.t - test auto::cpu
+auto/cpu-01.t - test auto::cpu
=head1 SYNOPSIS
- % prove t/steps/auto_cpu-01.t
+ % prove t/steps/auto/cpu-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/crypto-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_crypto-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_crypto-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/crypto-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -143,11 +143,11 @@
=head1 NAME
-auto_crypto-01.t - test auto::crypto
+auto/crypto-01.t - test auto::crypto
=head1 SYNOPSIS
- % prove t/steps/auto_crypto-01.t
+ % prove t/steps/auto/crypto-01.t
=head1 DESCRIPTION
@@ -157,7 +157,7 @@
=head1 HISTORY
-Mostly taken from F<t/steps/auto_gdbm-01.t>.
+Mostly taken from F<t/steps/auto/gdbm-01.t>.
=head1 AUTHOR
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/ctags-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_ctags-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_ctags-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/ctags-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#!perl
# Copyright (C) 2001-2007, Parrot Foundation.
# $Id$
-# auto_ctags-01.t
+# auto/ctags-01.t
use strict;
use warnings;
@@ -127,11 +127,11 @@
=head1 NAME
-t/steps/auto_ctags-01.t - tests Parrot::Configure step auto::ctags
+t/steps/auto/ctags-01.t - tests Parrot::Configure step auto::ctags
=head1 SYNOPSIS
- prove t/steps/auto_ctags-01.t
+ prove t/steps/auto/ctags-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/env-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_env-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_env-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/env-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_env-01.t
+# auto/env-01.t
use strict;
use warnings;
@@ -129,11 +129,11 @@
=head1 NAME
-auto_env-01.t - test auto::env
+auto/env-01.t - test auto::env
=head1 SYNOPSIS
- % prove t/steps/auto_env-01.t
+ % prove t/steps/auto/env-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/fink-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_fink-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_fink-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/fink-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2009, Parrot Foundation.
# $Id$
-# auto_fink-01.t
+# auto/fink-01.t
use strict;
use warnings;
@@ -258,11 +258,11 @@
=head1 NAME
-auto_fink-01.t - test auto::fink
+auto/fink-01.t - test auto::fink
=head1 SYNOPSIS
- % prove t/steps/auto_fink-01.t
+ % prove t/steps/auto/fink-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/format-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_format-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_format-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/format-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2008, Parrot Foundation.
# $Id$
-# auto_format-01.t
+# auto/format-01.t
use strict;
use warnings;
@@ -127,11 +127,11 @@
=head1 NAME
-auto_format-01.t - test auto::format
+auto/format-01.t - test auto::format
=head1 SYNOPSIS
- % prove t/steps/auto_format-01.t
+ % prove t/steps/auto/format-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/funcptr-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_funcptr-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_funcptr-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/funcptr-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_funcptr-01.t
+# auto/funcptr-01.t
use strict;
use warnings;
@@ -104,11 +104,11 @@
=head1 NAME
-auto_funcptr-01.t - test auto::funcptr
+auto/funcptr-01.t - test auto::funcptr
=head1 SYNOPSIS
- % prove t/steps/auto_funcptr-01.t
+ % prove t/steps/auto/funcptr-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/gc-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_gc-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gc-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/gc-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_gc-01.t
+# auto/gc-01.t
use strict;
use warnings;
@@ -135,11 +135,11 @@
=head1 NAME
-auto_gc-01.t - test auto::gc
+auto/gc-01.t - test auto::gc
=head1 SYNOPSIS
- % prove t/steps/auto_gc-01.t
+ % prove t/steps/auto/gc-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/gcc-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_gcc-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gcc-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/gcc-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_gcc-01.t
+# auto/gcc-01.t
use strict;
use warnings;
@@ -297,11 +297,11 @@
=head1 NAME
-auto_gcc-01.t - test auto::gcc
+auto/gcc-01.t - test auto::gcc
=head1 SYNOPSIS
- % prove t/steps/auto_gcc-01.t
+ % prove t/steps/auto/gcc-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/gdbm-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_gdbm-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gdbm-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/gdbm-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_gdbm-01.t
+# auto/gdbm-01.t
use strict;
use warnings;
@@ -171,11 +171,11 @@
=head1 NAME
-auto_gdbm-01.t - test auto::gdbm
+auto/gdbm-01.t - test auto::gdbm
=head1 SYNOPSIS
- % prove t/steps/auto_gdbm-01.t
+ % prove t/steps/auto/gdbm-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/gettext-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_gettext-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gettext-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/gettext-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_gettext-01.t
+# auto/gettext-01.t
use strict;
use warnings;
@@ -187,11 +187,11 @@
=head1 NAME
-auto_gettext-01.t - test auto::gettext
+auto/gettext-01.t - test auto::gettext
=head1 SYNOPSIS
- % prove t/steps/auto_gettext-01.t
+ % prove t/steps/auto/gettext-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/glibc-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_glibc-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_glibc-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/glibc-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2008, Parrot Foundation.
# $Id$
-# auto_glibc-01.t
+# auto/glibc-01.t
use strict;
use warnings;
@@ -64,11 +64,11 @@
=head1 NAME
-auto_glibc-01.t - test auto::glibc
+auto/glibc-01.t - test auto::glibc
=head1 SYNOPSIS
- % prove t/steps/auto_glibc-01.t
+ % prove t/steps/auto/glibc-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/gmp-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_gmp-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gmp-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/gmp-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_gmp-01.t
+# auto/gmp-01.t
use strict;
use warnings;
@@ -276,11 +276,11 @@
=head1 NAME
-auto_gmp-01.t - test auto::gmp
+auto/gmp-01.t - test auto::gmp
=head1 SYNOPSIS
- % prove t/steps/auto_gmp-01.t
+ % prove t/steps/auto/gmp-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/headers-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_headers-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_headers-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/headers-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_headers-01.t
+# auto/headers-01.t
use strict;
use warnings;
@@ -102,11 +102,11 @@
=head1 NAME
-auto_headers-01.t - test auto::headers
+auto/headers-01.t - test auto::headers
=head1 SYNOPSIS
- % prove t/steps/auto_headers-01.t
+ % prove t/steps/auto/headers-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/icu-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_icu-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_icu-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/icu-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2008, Parrot Foundation.
# $Id$
-# auto_icu-01.t
+# auto/icu-01.t
use strict;
use warnings;
@@ -693,11 +693,11 @@
=head1 NAME
-auto_icu-01.t - test auto::icu
+auto/icu-01.t - test auto::icu
=head1 SYNOPSIS
- % prove t/steps/auto_icu-01.t
+ % prove t/steps/auto/icu-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/inline-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_inline-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_inline-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/inline-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_inline-01.t
+# auto/inline-01.t
use strict;
use warnings;
@@ -135,11 +135,11 @@
=head1 NAME
-auto_inline-01.t - test auto::inline
+auto/inline-01.t - test auto::inline
=head1 SYNOPSIS
- % prove t/steps/auto_inline-01.t
+ % prove t/steps/auto/inline-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/isreg-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_isreg-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_isreg-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/isreg-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_isreg-01.t
+# auto/isreg-01.t
use strict;
use warnings;
@@ -86,11 +86,11 @@
=head1 NAME
-auto_isreg-01.t - test auto::isreg
+auto/isreg-01.t - test auto::isreg
=head1 SYNOPSIS
- % prove t/steps/auto_isreg-01.t
+ % prove t/steps/auto/isreg-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/jit-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_jit-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_jit-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/jit-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_jit-01.t
+# auto/jit-01.t
use strict;
use warnings;
@@ -366,11 +366,11 @@
=head1 NAME
-auto_jit-01.t - test auto::jit
+auto/jit-01.t - test auto::jit
=head1 SYNOPSIS
- % prove t/steps/auto_jit-01.t
+ % prove t/steps/auto/jit-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/macports-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_macports-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_macports-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/macports-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2009, Parrot Foundation.
# $Id$
-# auto_macports-01.t
+# auto/macports-01.t
use strict;
use warnings;
@@ -194,11 +194,11 @@
=head1 NAME
-auto_macports-01.t - test auto::macports
+auto/macports-01.t - test auto::macports
=head1 SYNOPSIS
- % prove t/steps/auto_macports-01.t
+ % prove t/steps/auto/macports-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/macports-02.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_macports-02.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_macports-02.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/macports-02.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_macports-02.t
+# auto/macports-02.t
use strict;
use warnings;
@@ -46,11 +46,11 @@
=head1 NAME
-auto_macports-02.t - test auto::macports
+auto/macports-02.t - test auto::macports
=head1 SYNOPSIS
- % prove t/steps/auto_macports-02.t
+ % prove t/steps/auto/macports-02.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/memalign-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_memalign-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_memalign-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/memalign-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_memalign-01.t
+# auto/memalign-01.t
use strict;
use warnings;
@@ -244,11 +244,11 @@
=head1 NAME
-auto_memalign-01.t - test auto::memalign
+auto/memalign-01.t - test auto::memalign
=head1 SYNOPSIS
- % prove t/steps/auto_memalign-01.t
+ % prove t/steps/auto/memalign-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/msvc-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_msvc-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_msvc-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/msvc-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_msvc-01.t
+# auto/msvc-01.t
use strict;
use warnings;
@@ -171,11 +171,11 @@
=head1 NAME
-auto_msvc-01.t - test auto::msvc
+auto/msvc-01.t - test auto::msvc
=head1 SYNOPSIS
- % prove t/steps/auto_msvc-01.t
+ % prove t/steps/auto/msvc-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/neg_0-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_neg_0-01.t)
==============================================================================
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/opengl-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_opengl-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_opengl-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/opengl-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2008, Parrot Foundation.
# $Id$
-# auto_opengl-01.t
+# auto/opengl-01.t
use strict;
use warnings;
@@ -208,11 +208,11 @@
=head1 NAME
- auto_opengl-01.t - test auto::opengl
+ auto/opengl-01.t - test auto::opengl
=head1 SYNOPSIS
- % prove t/steps/auto_opengl-01.t
+ % prove t/steps/auto/opengl-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/ops-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_ops-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_ops-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/ops-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_ops-01.t
+# auto/ops-01.t
use strict;
use warnings;
@@ -47,11 +47,11 @@
=head1 NAME
-auto_ops-01.t - test auto::ops
+auto/ops-01.t - test auto::ops
=head1 SYNOPSIS
- % prove t/steps/auto_ops-01.t
+ % prove t/steps/auto/ops-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/pcre-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_pcre-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_pcre-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/pcre-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2008, Parrot Foundation.
# $Id$
-# auto_pcre-01.t
+# auto/pcre-01.t
use strict;
use warnings;
@@ -150,11 +150,11 @@
=head1 NAME
- auto_pcre-01.t - test auto::pcre
+ auto/pcre-01.t - test auto::pcre
=head1 SYNOPSIS
- % prove t/steps/auto_pcre-01.t
+ % prove t/steps/auto/pcre-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/perldoc-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_perldoc-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_perldoc-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/perldoc-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_perldoc-01.t
+# auto/perldoc-01.t
use strict;
use warnings;
@@ -110,11 +110,11 @@
=head1 NAME
-auto_perldoc-01.t - test auto::perldoc
+auto/perldoc-01.t - test auto::perldoc
=head1 SYNOPSIS
- % prove t/steps/auto_perldoc-01.t
+ % prove t/steps/auto/perldoc-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/pmc-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_pmc-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_pmc-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/pmc-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_pmc-01.t
+# auto/pmc-01.t
use strict;
use warnings;
@@ -147,11 +147,11 @@
=head1 NAME
-auto_pmc-01.t - test auto::pmc
+auto/pmc-01.t - test auto::pmc
=head1 SYNOPSIS
- % prove t/steps/auto_pmc-01.t
+ % prove t/steps/auto/pmc-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/pod2man-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_pod2man-01.t)
==============================================================================
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/readline-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_readline-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_readline-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/readline-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_readline-01.t
+# auto/readline-01.t
use strict;
use warnings;
@@ -313,11 +313,11 @@
=head1 NAME
-auto_readline-01.t - test auto::readline
+auto/readline-01.t - test auto::readline
=head1 SYNOPSIS
- % prove t/steps/auto_readline-01.t
+ % prove t/steps/auto/readline-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/readline-02.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_readline-02.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_readline-02.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/readline-02.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_readline-02.t
+# auto/readline-02.t
use strict;
use warnings;
@@ -84,11 +84,11 @@
=head1 NAME
-auto_readline-02.t - test auto::readline
+auto/readline-02.t - test auto::readline
=head1 SYNOPSIS
- % prove t/steps/auto_readline-02.t
+ % prove t/steps/auto/readline-02.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/revision-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_revision-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_revision-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/revision-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_revision-01.t
+# auto/revision-01.t
use strict;
use warnings;
@@ -78,11 +78,11 @@
=head1 NAME
-auto_revision-01.t - test auto::revision
+auto/revision-01.t - test auto::revision
=head1 SYNOPSIS
- % prove t/steps/auto_revision-01.t
+ % prove t/steps/auto/revision-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/signal-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_signal-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_signal-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/signal-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_signal-01.t
+# auto/signal-01.t
use strict;
use warnings;
@@ -139,11 +139,11 @@
=head1 NAME
-auto_signal-01.t - test auto::signal
+auto/signal-01.t - test auto::signal
=head1 SYNOPSIS
- % prove t/steps/auto_signal-01.t
+ % prove t/steps/auto/signal-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/sizes-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_sizes-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_sizes-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/sizes-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_sizes-01.t
+# auto/sizes-01.t
use strict;
use warnings;
@@ -369,11 +369,11 @@
=head1 NAME
-auto_sizes-01.t - test auto::sizes
+auto/sizes-01.t - test auto::sizes
=head1 SYNOPSIS
- % prove t/steps/auto_sizes-01.t
+ % prove t/steps/auto/sizes-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/snprintf-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_snprintf-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_snprintf-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/snprintf-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_snprintf-01.t
+# auto/snprintf-01.t
use strict;
use warnings;
@@ -118,11 +118,11 @@
=head1 NAME
-auto_snprintf-01.t - test auto::snprintf
+auto/snprintf-01.t - test auto::snprintf
=head1 SYNOPSIS
- % prove t/steps/auto_snprintf-01.t
+ % prove t/steps/auto/snprintf-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/socklen_t-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_socklen_t-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_socklen_t-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/socklen_t-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_socklen_t-01.t
+# auto/socklen_t-01.t
use strict;
use warnings;
@@ -76,11 +76,11 @@
=head1 NAME
-auto_socklen_t-01.t - test auto::socklen_t
+auto/socklen_t-01.t - test auto::socklen_t
=head1 SYNOPSIS
- % prove t/steps/auto_socklen_t-01.t
+ % prove t/steps/auto/socklen_t-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/thread-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_crypto-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_crypto-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/thread-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,14 +1,13 @@
#! perl
-# Copyright (C) 2008, Parrot Foundation.
+# Copyright (C) 2009, Parrot Foundation.
# $Id$
-# gen_crypto-01.t
use strict;
use warnings;
-use Test::More tests => 8;
+use Test::More tests => 8;
use Carp;
-use lib qw( lib );
-use_ok('config::gen::crypto');
+use lib qw( lib t/configure/testlib );
+use_ok('config::auto::thread');
use Parrot::Configure;
use Parrot::Configure::Options qw( process_options );
use Parrot::Configure::Test qw(
@@ -16,35 +15,32 @@
rerun_defaults_for_testing
test_step_constructor_and_description
);
+use IO::CaptureOutput qw( capture );
-########## regular ##########
+########## --without-threads ##########
my ($args, $step_list_ref) = process_options(
{
- argv => [ ],
+ argv => [ q{--without-threads} ],
mode => q{configure},
}
);
my $conf = Parrot::Configure->new;
-my $serialized = $conf->pcfreeze();
+my $pkg = q{auto::thread};
-my $pkg = q{gen::crypto};
$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-ok(-f $step->{digest_pmc_template}, "Able to locate source code file");
+my $serialized = $conf->pcfreeze();
-my $has_crypto_orig = $conf->data->get('has_crypto');
-$conf->data->set( has_crypto => undef );
+$conf->options->set( %{$args} );
+my $step = test_step_constructor_and_description($conf);
my $ret = $step->runstep($conf);
ok( $ret, "runstep() returned true value" );
-is($step->result(), q{skipped}, "Got expected result");
-# re-set for next test
-$conf->data->set( has_crypto => $has_crypto_orig );
-$step->set_result( q{} );
+is($conf->data->get('HAS_THREADS'), 0,
+ "Got expected value for 'HAS_THREADS'");
+is($step->result(), q{no}, "Expected result was set");
$conf->replenish($serialized);
@@ -54,25 +50,29 @@
=head1 NAME
- gen_crypto-01.t - test gen::crypto
+auto/thread-01.t - test auto::thread
=head1 SYNOPSIS
- % prove t/steps/gen_crypto-01.t
+ % prove t/steps/auto/thread-01.t
=head1 DESCRIPTION
The files in this directory test functionality used by F<Configure.pl>.
-The tests in this file test gen::crypto.
+The tests in this file test auto::thread.
+
+=head1 HISTORY
+
+Mostly taken from F<t/steps/auto_gdbm-01.t>.
=head1 AUTHOR
-James E Keenan
+Francois Perrad
=head1 SEE ALSO
-config::gen::crypto, F<Configure.pl>.
+config::auto::thread, F<Configure.pl>.
=cut
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/va_ptr-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_va_ptr-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_va_ptr-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/va_ptr-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_va_ptr-01.t
+# auto/va_ptr-01.t
use strict;
use warnings;
@@ -36,11 +36,11 @@
=head1 NAME
-auto_va_ptr-01.t - test auto::va_ptr
+auto/va_ptr-01.t - test auto::va_ptr
=head1 SYNOPSIS
- % prove t/steps/auto_va_ptr-01.t
+ % prove t/steps/auto/va_ptr-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/auto/warnings-01.t (from r39980, branches/tt761_keys_revamp/t/steps/auto_warnings-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_warnings-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/auto/warnings-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# auto_warnings-01.t
+# auto/warnings-01.t
use strict;
use warnings;
@@ -153,11 +153,11 @@
=head1 NAME
-auto_warnings-01.t - test auto::warnings
+auto/warnings-01.t - test auto::warnings
=head1 SYNOPSIS
- % prove t/steps/auto_warnings-01.t
+ % prove t/steps/auto/warnings-01.t
=head1 DESCRIPTION
Deleted: branches/tt761_keys_revamp/t/steps/auto_alignptrs-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_alignptrs-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,99 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_alignptrs-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 17;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::alignptrs');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-
-########## regular; singular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::alignptrs};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $align = 1;
-$conf->data->set('ptr_alignment' => $align);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), qq{configured: $align byte}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########## regular; plural ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$align = 2;
-$conf->data->set('ptr_alignment' => $align);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), qq{configured: $align bytes}, "Expected result was set");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_alignptrs-01.t - test auto::alignptrs
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_alignptrs-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::alignptrs.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::alignptrs, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_alignptrs-02.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_alignptrs-02.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,119 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_alignptrs-02.t
-
-use strict;
-use warnings;
-use Test::More tests => 18;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::alignptrs');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## mock hpux ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::alignptrs};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my $serialized = $conf->pcfreeze();
-
-{
- $conf->data->set_p5( OSNAME => 'hpux' );
- my $ret = $step->runstep($conf);
- ok( $ret, "runstep() returned true value" );
- if ( $conf->data->get_p5('ccflags') !~ /DD64/ ) {
- is($conf->data->get('ptr_alignment'), 4,
- "Got expected pointer alignment for HP Unix");
- is($step->result(), qq{for hpux: 4 bytes},
- "Expected result was set");
- } else {
- pass("Cannot mock \%Config");
- pass("Cannot mock \%Config");
- }
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_ptr_alignment() ##########
-
-my $align = 2;
-auto::alignptrs::_evaluate_ptr_alignment($conf, $align);
-is($conf->data->get( 'ptr_alignment' ), 2,
- "Got expected pointer alignment");
-
-$conf->replenish($serialized);
-
-########## _evaluate_ptr_alignment() ##########
-
-$align = undef;
-eval { auto::alignptrs::_evaluate_ptr_alignment($conf, $align); };
-like($@, qr/Can't determine alignment!/, #'
- "Got expected 'die' message");
-
-$conf->replenish($serialized);
-
-########## _evaluate_results() ##########
-
-my ($results, $try_align);
-is(auto::alignptrs::_evaluate_results(q{OK}, 2), 2,
- "Got expected alignment");
-is(auto::alignptrs::_evaluate_results(q{OK align}, 2), undef,
- "Got undef as expected");
-is(auto::alignptrs::_evaluate_results(q{foobar}, 2), undef,
- "Got undef as expected");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_alignptrs-02.t - test auto::alignptrs
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_alignptrs-02.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::alignptrs.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::alignptrs, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_arch-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_arch-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,305 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_arch-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 102;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::arch');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########## Darwin special case ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::arch};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $errstr;
-{
- # As the t/configure/ test suite is currently (Dec 25 2007) constructed,
- # an uninitialized value warning is generated when this test is run on
- # Darwin because of a hack in config/auto/arch.pm. We capture the warning
- # and verify that we did so if on Darwin. In the future, we will be able
- # to eliminate this use of the signal handler because the
- # Parrot::Configure object will have the same information available to it
- # as it does during regular configuration.
- local $SIG{__WARN__} = \&_capture;
- my $ret = $step->runstep($conf);
- ok( $ret, "runstep() returned true value" );
- is($step->result(), q{}, "Result was empty string as expected");
- if ($^O eq 'darwin') {
- like(
- $errstr,
- qr/Uninitialized value/i,
- "Caught uninitialized value warning as expected"
- );
- } else {
- pass("Test not needed except on Darwin");
- }
-}
-
-$conf->replenish($serialized);
-
-########## --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my ($ret, $stdout);
- capture(
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- );
- ok( $ret, "runstep() returned true value" );
- is($step->result(), q{}, "Result was empty string as expected");
- like($stdout,
- qr/determining operating system and cpu architecture/s,
- "Got expected verbose output"
- );
-}
-
-$conf->replenish($serialized);
-
-########## mock architecture ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $pseudoarch = q{foobar};
-$conf->data->set('archname' => $pseudoarch);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result was empty string as expected");
-is($conf->data->get('cpuarch'), q{},
- "'cpuarch' was set as expected");
-is($conf->data->get('osname'), $pseudoarch,
- "'osname' was set as expected");
-
-$conf->replenish($serialized);
-
-########## mock darwin ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$pseudoarch = q{darwin-thread-multi-2level};
-$conf->data->set('archname' => $pseudoarch);
-my $pseudobyteorder = 1234;
-$conf->data->set('byteorder' => $pseudobyteorder);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result was empty string as expected");
-is($conf->data->get('cpuarch'), q{i386},
- "'cpuarch' was set as expected");
-is($conf->data->get('osname'), q{darwin},
- "'osname' was set as expected");
-
-$conf->replenish($serialized);
-
-########## mock darwin ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$pseudoarch = q{darwin-thread-multi-2level};
-$conf->data->set('archname' => $pseudoarch);
-$pseudobyteorder = 4321;
-$conf->data->set('byteorder' => $pseudobyteorder);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result was empty string as expected");
-is($conf->data->get('cpuarch'), q{ppc},
- "'cpuarch' was set as expected");
-is($conf->data->get('osname'), q{darwin},
- "'osname' was set as expected");
-
-$conf->replenish($serialized);
-
-########## mock win32 ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$pseudoarch = q{MSWin32-x64};
-$conf->data->set('archname' => $pseudoarch);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result was empty string as expected");
-is($conf->data->get('cpuarch'), q{amd64},
- "'cpuarch' was set as expected");
-is($conf->data->get('osname'), q{MSWin32},
- "'osname' was set as expected");
-
-$conf->replenish($serialized);
-
-########## mock win32 ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$pseudoarch = q{MSWin32-i386};
-$conf->data->set('archname' => $pseudoarch);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result was empty string as expected");
-is($conf->data->get('cpuarch'), q{i386},
- "'cpuarch' was set as expected");
-is($conf->data->get('osname'), q{MSWin32},
- "'osname' was set as expected");
-
-$conf->replenish($serialized);
-
-########## mock cygwin ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$pseudoarch = q{cygwin};
-$conf->data->set('archname' => $pseudoarch);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result was empty string as expected");
-is($conf->data->get('cpuarch'), q{i386},
- "'cpuarch' was set as expected");
-is($conf->data->get('osname'), q{cygwin},
- "'osname' was set as expected");
-
-$conf->replenish($serialized);
-
-########## mock powerpc-linux ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$pseudoarch = q{powerpc-linux};
-$conf->data->set('archname' => $pseudoarch);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result was empty string as expected");
-is($conf->data->get('cpuarch'), q{ppc},
- "'cpuarch' was set as expected");
-is($conf->data->get('osname'), q{linux},
- "'osname' was set as expected");
-
-$conf->replenish($serialized);
-
-########## mock cygwin-i486 ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$pseudoarch = q{cygwin-i486};
-$conf->data->set('archname' => $pseudoarch);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result was empty string as expected");
-is($conf->data->get('cpuarch'), q{i386},
- "'cpuarch' was set as expected");
-is($conf->data->get('osname'), q{cygwin},
- "'osname' was set as expected");
-
-pass("Completed all tests in $0");
-
-sub _capture { $errstr = $_[0]; }
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_arch-01.t - test auto::arch
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_arch-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::arch.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::arch, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_attributes-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_attributes-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,84 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_attributes-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::attributes');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw | capture |;
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::attributes};
-
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-
-{
- my $rv;
- my $stdout;
- capture(
- sub { $rv = $step->runstep($conf); },
- \$stdout,
- );
- ok( defined $rv, "runstep() returned defined value" );
- unlike($conf->data->get('ccflags'),
- qr/HASATTRIBUTE_NEVER_WORKS/,
- "'ccflags' excludes bogus attribute as expected"
- );
-}
-$conf->cc_clean();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_attributes-01.t - test auto::attributes
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_attributes-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::attributes.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::attributes, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_backtrace-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_backtrace-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,94 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_backtrace-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 19;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::backtrace');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my ($task, $step_name, $step, $ret);
-my $pkg = q{auto::backtrace};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-
-$conf->replenish($serialized);
-
-########## _evaluate_backtrace() ##########
-
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-my $error = q{mock_error};
-ok($step->_evaluate_backtrace($conf, $error),
- "_evaluate_backtrace returned true value");
-is($step->result, 'no', "Got expected result");
-
-$error = q{};
-ok($step->_evaluate_backtrace($conf, $error),
- "_evaluate_backtrace returned true value");
-is($step->result, 'yes', "Got expected result");
-ok($conf->data->get('backtrace'),
- "backtrace set as expected");
-
-ok($step->runstep($conf), "runstep() returned true value");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_backtrace-01.t - test auto::backtrace
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_backtrace-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::backtrace.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::backtrace, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_byteorder-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_byteorder-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,129 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_byteorder-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 24;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::byteorder');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## _evaluate_byteorder() ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::byteorder};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my $byteorder = q{1234};
-my $rv = $step->_evaluate_byteorder($conf, $byteorder);
-ok( $rv, "_evaluate_byteorder() returned true value as expected");
-is( $conf->data->get( 'byteorder'), $byteorder, "Got expected byteorder");
-ok( ! $conf->data->get( 'bigendian' ), "Not big-endian");
-is( $step->result, 'little-endian', "Rather, little-endian");
-
-$conf->replenish($serialized);
-
-########## _evaluate_byteorder() ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$byteorder = q{8765};
-$rv = $step->_evaluate_byteorder($conf, $byteorder);
-ok( $rv, "_evaluate_byteorder() returned true value as expected");
-is( $conf->data->get( 'byteorder'), $byteorder, "Got expected byteorder");
-ok( $conf->data->get( 'bigendian' ), "big-endian");
-is( $step->result, 'big-endian', "Indeed, big-endian");
-
-$byteorder = q{4321};
-$rv = $step->_evaluate_byteorder($conf, $byteorder);
-ok( $rv, "_evaluate_byteorder() returned true value as expected");
-is( $conf->data->get( 'byteorder'), $byteorder, "Got expected byteorder");
-ok( $conf->data->get( 'bigendian' ), "big-endian");
-is( $step->result, 'big-endian', "Indeed, big-endian");
-
-$conf->replenish($serialized);
-
-########## _evaluate_byteorder(); phony byte order ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$byteorder = q{foobar};
-eval {
- $rv = $step->_evaluate_byteorder($conf, $byteorder);
-};
-like($@,
- qr/Unsupported byte-order \[$byteorder\]!/,
- "Got error message expected with bad byte-order");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_byteorder-01.t - test auto::byteorder
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_byteorder-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::byteorder.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::byteorder, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_cgoto-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_cgoto-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,167 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_cgoto-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 56;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::cgoto');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-
-########### regular ###########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::cgoto};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-ok(defined($step->result()), "A result was defined");
-ok(defined($conf->data->get('TEMP_cg_h')), "An attribute has been defined");
-ok(defined($conf->data->get('TEMP_cg_c')), "An attribute has been defined");
-ok(defined($conf->data->get('TEMP_cg_o')), "An attribute has been defined");
-ok(defined($conf->data->get('TEMP_cg_r')), "An attribute has been defined");
-ok(defined($conf->data->get('cg_flag')), "An attribute has been defined");
-
-$conf->replenish($serialized);
-
-########### _probe_for_cgoto() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->options->set(cgoto => 1);
-is(auto::cgoto::_probe_for_cgoto($conf), 1,
- "Got expected return value");
-$conf->options->set(cgoto => 0);
-is(auto::cgoto::_probe_for_cgoto($conf), 0,
- "Got expected return value");
-$conf->options->set(cgoto => undef);
-ok(defined(auto::cgoto::_probe_for_cgoto($conf)),
- "Probe returned a defined value");
-
-########### _evaluate_cgoto() ###########
-
-$step->_evaluate_cgoto($conf, 1);
-ok($conf->data->get('TEMP_cg_h'), "An attribute was set to true value");
-ok($conf->data->get('TEMP_cg_c'), "An attribute was set to true value");
-ok($conf->data->get('TEMP_cg_o'), "An attribute was set to true value");
-ok($conf->data->get('TEMP_cg_r'), "An attribute was set to true value");
-ok($conf->data->get('cg_flag'), "An attribute was set to true value");
-is($step->result(), q{yes}, "Expected result was set");
-
-$step->_evaluate_cgoto($conf, 0);
-is($conf->data->get('TEMP_cg_h'), q{}, "An attribute was set to empty string");
-is($conf->data->get('TEMP_cg_c'), q{}, "An attribute was set to empty string");
-is($conf->data->get('TEMP_cg_o'), q{}, "An attribute was set to empty string");
-is($conf->data->get('TEMP_cg_r'), q{}, "An attribute was set to empty string");
-is($conf->data->get('cg_flag'), q{}, "An attribute was set to empty string");
-is($step->result(), q{no}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $stdout;
- capture(
- sub { $step->_evaluate_cgoto($conf, 1) },
- \$stdout
- );
- ok($conf->data->get('TEMP_cg_h'), "An attribute was set to true value");
- ok($conf->data->get('TEMP_cg_c'), "An attribute was set to true value");
- ok($conf->data->get('TEMP_cg_o'), "An attribute was set to true value");
- ok($conf->data->get('TEMP_cg_r'), "An attribute was set to true value");
- ok($conf->data->get('cg_flag'), "An attribute was set to true value");
- is($step->result(), q{yes}, "Expected result was set");
-}
-
-{
- my $stdout;
- capture(
- sub { $step->_evaluate_cgoto($conf, 0) },
- \$stdout
- );
- is($conf->data->get('TEMP_cg_h'), q{},
- "An attribute was set to empty string");
- is($conf->data->get('TEMP_cg_c'), q{},
- "An attribute was set to empty string");
- is($conf->data->get('TEMP_cg_o'), q{},
- "An attribute was set to empty string");
- is($conf->data->get('TEMP_cg_r'), q{},
- "An attribute was set to empty string");
- is($conf->data->get('cg_flag'), q{},
- "An attribute was set to empty string");
- is($step->result(), q{no}, "Expected result was set");
-}
-
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_cgoto-01.t - test auto::cgoto
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_cgoto-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::cgoto.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::cgoto, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_cpu-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_cpu-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,104 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_cpu-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 22;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::cpu');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########### --verbose ###########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::cpu};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-{
- $conf->data->set('cpuarch' => 'foobar');
- my ($ret, $stdout);
- capture(
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- );
- ok($ret, "runstep() returned true value" );
- ok(! $step->result(), "Got (default) false result as expected");
- like($stdout, qr/cpu hints = 'auto::cpu::foobar::auto'/s,
- "Got expected verbose output");
- like($stdout, qr/no cpu specific hints/s,
- "Got expected verbose output");
-}
-
-$conf->replenish($serialized);
-
-########### mock cpuarch ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('cpuarch' => 'foobar');
-my $ret = $step->runstep($conf);
-ok($ret, "runstep() returned true value" );
-ok(! $step->result(), "Got (default) false result as expected");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_cpu-01.t - test auto::cpu
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_cpu-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::cpu.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::cpu, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_crypto-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_crypto-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,177 +0,0 @@
-#! perl
-# Copyright (C) 2008, Parrot Foundation.
-# $Id$
-
-use strict;
-use warnings;
-use Test::More tests => 24;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::crypto');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########## --without-crypto ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--without-crypto} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::crypto};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('has_crypto'), 0,
- "Got expected value for 'has_crypto'");
-is($step->result(), q{no}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########## _select_lib() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-# Mock different OS/compiler combinations.
-my ($osname, $cc, $initial_libs);
-$initial_libs = $conf->data->get('libs');
-$osname = 'mswin32';
-$cc = 'gcc';
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'libcrypto.lib',
- default => '-lcrypto',
-} ),
- '-lcrypto',
- "_select_lib() returned expected value");
-
-$osname = 'mswin32';
-$cc = 'cc';
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'libcrypto.lib',
- default => '-lcrypto',
-} ),
- 'libcrypto.lib',
- "_select_lib() returned expected value");
-
-$osname = 'foobar';
-$cc = 'cc';
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'libcrypto.lib',
- default => '-lcrypto',
-} ),
- '-lcrypto',
- "_select_lib() returned expected value");
-
-my $verbose = undef;
-
-$conf->replenish($serialized);
-
-########## --without-crypto; _evaluate_cc_run() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--without-crypto} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my ($test, $has_crypto);
-$test = qq{OpenSSL 0.9.9z\n};
-$has_crypto = 0;
-$verbose = undef;
-$has_crypto = $step->_evaluate_cc_run($conf, $test, $has_crypto, $verbose);
-is($has_crypto, 1, "'has_crypto' set as expected");
-is($step->result(), 'yes, 0.9.9z', "Expected result was set");
-# Prepare for next test
-$step->set_result(undef);
-
-$test = qq{foobar};
-$has_crypto = 0;
-$verbose = undef;
-$has_crypto = $step->_evaluate_cc_run($conf, $test, $has_crypto, $verbose);
-is($has_crypto, 0, "'has_crypto' set as expected");
-ok(! defined $step->result(), "Result is undefined, as expected");
-
-{
- my $stdout;
- $test = qq{OpenSSL 0.9.9z\n};
- $has_crypto = 0;
- $verbose = 1;
- capture(
- sub { $has_crypto =
- $step->_evaluate_cc_run($conf, $test, $has_crypto, $verbose); },
- \$stdout,
- );
- is($has_crypto, 1, "'has_crypto' set as expected");
- is($step->result(), 'yes, 0.9.9z', "Expected result was set");
- like($stdout, qr/\(yes\)/, "Got expected verbose output");
- # Prepare for next test
- $step->set_result(undef);
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_crypto-01.t - test auto::crypto
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_crypto-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::crypto.
-
-=head1 HISTORY
-
-Mostly taken from F<t/steps/auto_gdbm-01.t>.
-
-=head1 AUTHOR
-
-Francois Perrad
-
-=head1 SEE ALSO
-
-config::auto::crypto, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_ctags-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_ctags-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,151 +0,0 @@
-#!perl
-# Copyright (C) 2001-2007, Parrot Foundation.
-# $Id$
-# auto_ctags-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 28;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::ctags');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::ctags};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my %possible_ctags = map {$_,1}
- qw( ctags exuberant-ctags ctags-exuberant exctags );
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-ok(defined($step->result()), "Result was defined");
-ok($possible_ctags{$conf->data->get('ctags')},
- "Acceptable value for 'ctags' attribute was set");
-
-$conf->replenish($serialized);
-
-########## --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $stdout;
- my $ret = capture(
- sub { $step->runstep($conf) },
- \$stdout
- );
- ok( $ret, "runstep() returned true value" );
- ok( defined $step->result(), "Result was defined");
- ok($possible_ctags{$conf->data->get('ctags')},
- "Acceptable value for 'ctags' attribute was set");
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_ctags() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$conf->replenish($serialized);
-
-my $pseudo_ctags;
-$pseudo_ctags = q{alpha};
-$step->_evaluate_ctags($conf, $pseudo_ctags, 1);
-is($conf->data->get('ctags'), $pseudo_ctags,
- "'ctags' attribute was set as expected");
-is($step->result(), q{yes}, "Got expected result");
-
-$pseudo_ctags = q{alpha};
-$step->_evaluate_ctags($conf, $pseudo_ctags, 0);
-is($conf->data->get('ctags'), 'ctags',
- "'ctags' attribute was set as expected");
-is($step->result(), q{no}, "Got expected result");
-
-$conf->replenish($serialized);
-
-########## _probe_for_ctags_output() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-ok(auto::ctags::_probe_for_ctags_output('Exuberant Ctags', 0),
- "Probe returned true when output matched");
-ok(! auto::ctags::_probe_for_ctags_output('alpha', 0),
- "Probe returned false when output matched");
-{
- my $stdout;
- my $rv = capture(
- sub { auto::ctags::_probe_for_ctags_output('Exuberant Ctags', 1) },
- \$stdout
- );
- ok($rv, "Probe returned true when output matched");
-}
-{
- my $stdout;
- my $rv = capture(
- sub { auto::ctags::_probe_for_ctags_output('alpha', 1) },
- \$stdout
- );
- ok(! $rv, "Probe returned false when output matched");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-t/steps/auto_ctags-01.t - tests Parrot::Configure step auto::ctags
-
-=head1 SYNOPSIS
-
- prove t/steps/auto_ctags-01.t
-
-=head1 DESCRIPTION
-
-This file holds tests for auto::ctags.
-
-=head1 AUTHOR
-
-Paul Cochrane <paultcochrane at gmail dot com>
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_env-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_env-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,159 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_env-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 29;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::env');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########### regular ###########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::env};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-ok($step->runstep($conf), "runstep() returned true value");
-
-$conf->replenish($serialized);
-
-########### _evaluate_env() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-my ($setenv, $unsetenv);
-$setenv = 1;
-$unsetenv = 1;
-$step->_evaluate_env($conf, $setenv, $unsetenv);
-is($step->result(), q{both}, "Got expected result");
-$setenv = 1;
-$unsetenv = 0;
-$step->_evaluate_env($conf, $setenv, $unsetenv);
-is($step->result(), q{setenv}, "Got expected result");
-$setenv = 0;
-$unsetenv = 1;
-$step->_evaluate_env($conf, $setenv, $unsetenv);
-is($step->result(), q{unsetenv}, "Got expected result");
-$setenv = 0;
-$unsetenv = 0;
-$step->_evaluate_env($conf, $setenv, $unsetenv);
-is($step->result(), q{no}, "Got expected result");
-
-$conf->replenish($serialized);
-
-########### --verbose; _evaluate_env() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- my $stdout;
- $setenv = 1;
- $unsetenv = 1;
- capture(
- sub { $step->_evaluate_env($conf, $setenv, $unsetenv) },
- \$stdout
- );
- like($stdout, qr/both/, "Got expected verbose output");
- is($step->result(), q{both}, "Got expected result");
-}
-{
- my $stdout;
- $setenv = 1;
- $unsetenv = 0;
- capture(
- sub { $step->_evaluate_env($conf, $setenv, $unsetenv) },
- \$stdout
- );
- like($stdout, qr/setenv/, "Got expected verbose output");
- is($step->result(), q{setenv}, "Got expected result");
-}
-{
- my $stdout;
- $setenv = 0;
- $unsetenv = 1;
- capture(
- sub { $step->_evaluate_env($conf, $setenv, $unsetenv) },
- \$stdout
- );
- like($stdout, qr/unsetenv/, "Got expected verbose output");
- is($step->result(), q{unsetenv}, "Got expected result");
-}
-{
- my $stdout;
- $setenv = 0;
- $unsetenv = 0;
- capture(
- sub { $step->_evaluate_env($conf, $setenv, $unsetenv) },
- \$stdout
- );
- like($stdout, qr/no/, "Got expected verbose output");
- is($step->result(), q{no}, "Got expected result");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_env-01.t - test auto::env
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_env-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::env.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::env, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_fink-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_fink-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,289 +0,0 @@
-#! perl
-# Copyright (C) 2007-2009, Parrot Foundation.
-# $Id$
-# auto_fink-01.t
-
-use strict;
-use warnings;
-use Test::More;
-use Carp;
-use File::Temp;
-use lib qw( lib t/configure/testlib );
-
-plan( skip_all => 'fink is Darwin only' ) unless $^O =~ /darwin/i;
-plan( tests => 55 );
-
-use_ok('config::init::defaults');
-use_ok('config::auto::fink');
-
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########## Darwin but no good Fink ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::fink};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-
-# Success in the following test means:
-# (a) OS is Darwin.
-# (b) Either Fink is not installed or it is installed correctly, i.e., we can
-# locate the Fink subdirectories we need for later Parrot configuration steps.
-ok($step->runstep($conf), "runstep() returned true value");
-
-$conf->replenish($serialized);
-
-########## not Darwin ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-# mock not Darwin
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$conf->data->set_p5( 'OSNAME' => 'foobar' );
-ok($step->runstep($conf), "runstep() returned true value");
-is($step->result(), q{skipped}, "Got expected result for non-Darwin OS");
-
-$conf->replenish($serialized);
-
-########## no Fink ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-# mock no Fink
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$step->{fink_conf} = q{my_ridiculous_foobar};
-my $msg = q{Fink not installed};
-
-{
- ok($step->runstep($conf), "runstep() returned true value");
- is($step->result(), $msg, "Got expected result for $msg");
-}
-
-$conf->replenish($serialized);
-
-########## Darwin but defective Fink ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- # mock Fink config file with no Basepath
- my $tfile = File::Temp->new();
- open my $fh, ">", $tfile
- or croak "Unable to open temporary file for writing";
- print $fh "Message: Hello world\n";
- close $fh or croak "Unable to close temporary file after writing";
- $step->{fink_conf} = $tfile;
- ok(! defined $step->runstep($conf),
- "runstep() returned undef due to defective Fink config file");
- is($step->result(), q{failed},
- "Got expected result for defective Fink Config file");
-}
-
-$conf->replenish($serialized);
-
-########## Darwin but defective Fink ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- # mock Fink config file with non-existent Basepath
- my $tfile = File::Temp->new();
- open my $fh, ">", $tfile
- or croak "Unable to open temporary file for writing";
- print $fh "Basepath: /my/phony/directory\n";
- close $fh or croak "Unable to close temporary file after writing";
- $step->{fink_conf} = $tfile;
- ok(! defined $step->runstep($conf),
- "runstep() returned undef due to unlocateable Fink directories");
- is($step->result(), q{failed},
- "Got expected result for unlocateable Fink directories");
-}
-
-$conf->replenish($serialized);
-
-########## not Darwin; --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- # mock not Darwin
- my $phony_OS = q{foobar};
- $conf->data->set_p5( 'OSNAME' => $phony_OS );
- my ($rv, $stdout);
- capture(
- sub { $rv = $step->runstep($conf); },
- \$stdout,
- );
- ok($rv, "runstep() returned true value");
- is($step->result(), q{skipped}, "Got expected result for non-Darwin OS");
- like($stdout,
- qr/Operating system is $phony_OS; Fink is Darwin only/,
- "Got expected verbose output when OS is not Darwin");
-}
-
-$conf->replenish($serialized);
-
-########## Darwin; --verbose; no Fink ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- # mock no Fink
- $step->{fink_conf} = q{my_ridiculous_foobar};
- my $msg = q{Fink not installed};
- my ($rv, $stdout);
- capture(
- sub { $rv = $step->runstep($conf); },
- \$stdout,
- );
- ok($rv, "runstep() returned true value");
- is($step->result(), $msg,
- "Got expected result for $msg");
- like($stdout,
- qr/Fink configuration file not located/,
- "Got expected verbose output when OS is not Darwin");
-}
-
-$conf->replenish($serialized);
-
-########## Darwin; --verbose; defective Fink ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- # mock Fink config file with no Basepath
- my $tfile = File::Temp->new();
- open my $fh, ">", $tfile
- or croak "Unable to open temporary file for writing";
- print $fh "Message: Hello world\n";
- close $fh or croak "Unable to close temporary file after writing";
- $step->{fink_conf} = $tfile;
-
- my ($rv, $stdout);
- capture(
- sub { $rv = $step->runstep($conf); },
- \$stdout,
- );
- ok(! defined $rv,
- "runstep() returned undef due to defective Fink config file");
- is($step->result(), q{failed},
- "Got expected result for defective Fink Config file");
- like($stdout,
- qr/Fink configuration file defective: no 'Basepath'/,
- "Got expected verbose output when Fink config file lacked 'Basepath'");
-}
-
-$conf->replenish($serialized);
-
-########## Darwin; --verbose; defective Fink ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- # mock Fink config file with non-existent Basepath
- my $tfile = File::Temp->new();
- open my $fh, ">", $tfile
- or croak "Unable to open temporary file for writing";
- print $fh "Basepath: /my/phony/directory\n";
- close $fh or croak "Unable to close temporary file after writing";
- $step->{fink_conf} = $tfile;
-
- my ($rv, $stdout);
- capture(
- sub { $rv = $step->runstep($conf); },
- \$stdout,
- );
- ok(! defined $rv,
- "runstep() returned undef due to unlocateable Fink directories");
- is($step->result(), q{failed},
- "Got expected result for unlocateable Fink directories");
- like($stdout,
- qr/Could not locate Fink directories/,
- "Got expected verbose output for unlocateable Fink directories");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_fink-01.t - test auto::fink
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_fink-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::fink. Some tests will run only on Darwin.
-Others simulate how auto::fink runs on operating systems other than Darwin.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::fink, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_format-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_format-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,157 +0,0 @@
-#! perl
-# Copyright (C) 2008, Parrot Foundation.
-# $Id$
-# auto_format-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 16;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::format');
-use Parrot::BuildUtil;
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## _set_intvalfmt() ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-my ($task, $step_name, $step, $ret);
-my $pkg = q{auto::format};
-
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- $conf->data->set( iv => 'int' );
- auto::format::_set_intvalfmt($conf);
- is($conf->data->get( 'intvalfmt' ), '%d',
- "intvalfmt set as expected");
- # reset for next test
- $conf->data->set( iv => undef );
-}
-{
- $conf->data->set( iv => 'long' );
- auto::format::_set_intvalfmt($conf);
- is($conf->data->get( 'intvalfmt' ), '%ld',
- "intvalfmt set as expected");
- # reset for next test
- $conf->data->set( iv => undef );
-}
-{
- $conf->data->set( iv => 'long int' );
- auto::format::_set_intvalfmt($conf);
- is($conf->data->get( 'intvalfmt' ), '%ld',
- "intvalfmt set as expected");
- # reset for next test
- $conf->data->set( iv => undef );
-}
-{
- $conf->data->set( iv => 'long long' );
- auto::format::_set_intvalfmt($conf);
- is($conf->data->get( 'intvalfmt' ), '%lld',
- "intvalfmt set as expected");
- # reset for next test
- $conf->data->set( iv => undef );
-}
-{
- $conf->data->set( iv => 'long long int' );
- auto::format::_set_intvalfmt($conf);
- is($conf->data->get( 'intvalfmt' ), '%lld',
- "intvalfmt set as expected");
- # reset for next test
- $conf->data->set( iv => undef );
-}
-{
- my $type = 'foobar';
- $conf->data->set( iv => $type );
- eval { auto::format::_set_intvalfmt($conf); };
- like($@,
- qr/Can't find a printf-style format specifier for type '$type'/, #'
- "Got expected error message");
-}
-
-########## _set_floatvalfmt_nvsize() ##########
-
-{
- $conf->data->set( nv => 'double' );
- auto::format::_set_floatvalfmt_nvsize($conf);
- is($conf->data->get( 'floatvalfmt' ), '%.15g',
- "floatvalfmt set as expected");
- is($conf->data->get( 'nvsize' ), $conf->data->get( 'doublesize' ),
- "nvsize set as expected");
- $conf->data->set(
- nv => undef,
- floatvalfmt => undef,
- nvsize => undef,
- );
-}
-{
- use Config;
- my $p5format = '%.15' . $Config{sPRIgldbl};
- $p5format =~ s/"//g;; # Perl 5's Config value has embedded double quotes
- $conf->data->set( nv => 'long double' );
- auto::format::_set_floatvalfmt_nvsize($conf);
- is($conf->data->get( 'floatvalfmt' ), $p5format,
- "floatvalfmt set as expected");
- is($conf->data->get( 'nvsize' ), $conf->data->get( 'hugefloatvalsize' ),
- "nvsize set as expected");
- $conf->data->set(
- nv => undef,
- floatvalfmt => undef,
- nvsize => undef,
- );
-}
-{
- my $type = 'foobar';
- $conf->data->set( nv => 'foobar' );
- eval { auto::format::_set_floatvalfmt_nvsize($conf); };
- like($@,
- qr/Can't find a printf-style format specifier for type '$type'/, #'
- "Got expected error message");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_format-01.t - test auto::format
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_format-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::format.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::format, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_funcptr-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_funcptr-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,134 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_funcptr-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 28;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::funcptr');
-use Parrot::BuildUtil;
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw( test_step_thru_runstep);
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########### --jitcapable=0 ###########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ q{--jitcapable=0} ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::funcptr};
-
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok($ret, "runstep() returned defined value" );
-
-$conf->replenish($serialized);
-
-########### _cast_void_pointers_msg() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $stdout;
- my $ret = capture(
- sub { auto::funcptr::_cast_void_pointers_msg(); },
- \$stdout,
- );
- like($stdout, qr/Although it is not required/s,
- "Got expected advisory message");
-}
-
-########### _set_positive_result() ###########
-
-{
- my $stdout;
- my $ret = capture(
- sub { auto::funcptr::_set_positive_result($step, $conf); },
- \$stdout,
- );
- is($step->result, q{yes}, "Got expected result");
- ok(! $stdout, "Nothing printed to STDOUT, as expected");
-}
-
-$conf->replenish($serialized);
-
-########### --verbose; _set_positive_result() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $stdout;
- my $ret = capture(
- sub { auto::funcptr::_set_positive_result($step, $conf); },
- \$stdout,
- );
- is($step->result, q{yes}, "Got expected result");
- like($stdout, qr/yes/, "Got expected verbose output");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_funcptr-01.t - test auto::funcptr
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_funcptr-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test aspects of auto::funcptr.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::funcptr, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_gc-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gc-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,165 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_gc-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 35;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::gc');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########### --verbose ###########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--verbose} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::gc};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-{
- my ($ret, $stdout);
- capture(
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- );
- ok( $ret, "runstep() returned true value" );
- like( $stdout, qr/\(gc\)/, "Got expected verbose output");
- is($conf->data->get('gc_flag'), q{},
- "Got expected value for 'gc_flag'");
-}
-
-$conf->replenish($serialized);
-
-########### --gc=gc ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--gc=gc} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('gc_flag'), q{},
- "Got expected value for 'gc_flag'");
-
-$conf->replenish($serialized);
-
-########### --gc=libc ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--gc=libc} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('i_malloc' => 1);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('gc_flag'), '-DGC_IS_MALLOC',
- "Got expected value for 'gc_flag'");
-is($conf->data->get('malloc_header'), 'malloc.h',
- "Got expected value for 'malloc_header'");
-
-$conf->replenish($serialized);
-
-########### --gc=libc ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--gc=libc} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('i_malloc' => undef);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('gc_flag'), '-DGC_IS_MALLOC',
- "Got expected value for 'gc_flag'");
-is($conf->data->get('malloc_header'), 'stdlib.h',
- "Got expected value for 'malloc_header'");
-
-$conf->replenish($serialized);
-
-########### --gc=malloc ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--gc=malloc} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('gc_flag'), '-DGC_IS_MALLOC',
- "Got expected value for 'gc_flag'");
-
-$conf->replenish($serialized);
-
-########### --gc=malloc-trace ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--gc=malloc-trace} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('gc_flag'), '-DGC_IS_MALLOC',
- "Got expected value for 'gc_flag'");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_gc-01.t - test auto::gc
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_gc-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::gc.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::gc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_gcc-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gcc-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,327 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_gcc-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 122;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::progs');
-use_ok('config::auto::gcc');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw | capture |;
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-test_step_thru_runstep( $conf, q{inter::progs}, $args );
-
-my $pkg = q{auto::gcc};
-
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-
-ok($step->runstep($conf), "runstep returned true value");
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc() ##########
-
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-my $gnucref = {};
-ok($step->_evaluate_gcc($conf, $gnucref),
- "_evaluate_gcc() returned true value");
-ok(! defined $conf->data->get( 'gccversion' ),
- "gccversion undef as expected");
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc() ##########
-
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$gnucref = {};
-$gnucref->{__GNUC__} = 1;
-$gnucref->{__INTEL_COMPILER} = 1;
-ok($step->_evaluate_gcc($conf, $gnucref),
- "_evaluate_gcc() returned true value");
-ok(! defined $conf->data->get( 'gccversion' ),
- "gccversion undef as expected");
-is($step->result(), q{no}, "Got expected result");
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc(); --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- my $rv;
- my $stdout;
- my $gnucref = {};
- $gnucref->{__GNUC__} = undef;
- capture ( sub {$rv = $step->_evaluate_gcc($conf, $gnucref) }, \$stdout);
- ok($rv, "_evaluate_gcc() returned true value");
- ok( $stdout, "verbose output captured" );
- ok(! defined $conf->data->get( 'gccversion' ),
- "gccversion undef as expected");
- is($step->result(), q{no}, "Got expected result");
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$gnucref = {};
-$gnucref->{__GNUC__} = 1;
-$gnucref->{__INTEL_COMPILER} = 1;
-ok($step->_evaluate_gcc($conf, $gnucref),
- "_evaluate_gcc() returned true value");
-ok(! defined $conf->data->get( 'gccversion' ),
- "gccversion undef as expected");
-is($step->result(), q{no}, "Got expected result");
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc(); --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- my $rv;
- my $stdout;
- my $gnucref = {};
- $gnucref->{__GNUC__} = q{abc123};
- capture ( sub {$rv = $step->_evaluate_gcc($conf, $gnucref) }, \$stdout);
- ok($rv, "_evaluate_gcc() returned true value");
- ok( $stdout, "verbose output captured" );
- ok(! defined $conf->data->get( 'gccversion' ),
- "gccversion undef as expected");
- is($step->result(), q{no}, "Got expected result");
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc() ##########
-
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- my $rv;
- my $stdout;
- my $gnucref = {};
- $gnucref->{__GNUC__} = q{123};
- $gnucref->{__GNUC_MINOR__} = q{abc};
- capture ( sub {$rv = $step->_evaluate_gcc($conf, $gnucref) }, \$stdout);
- ok($rv, "_evaluate_gcc() returned true value");
- ok( !$stdout, "verbose output captured" );
- ok(defined $conf->data->get( 'gccversion' ),
- "gccversion defined as expected");
- is($conf->data->get( 'gccversion' ), 123,
- "Got expected value for gccversion");
- like($step->result(), qr/^yes/, "Got expected result");
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- my $rv;
- my $stdout;
- my $gnucref = {};
- $gnucref->{__GNUC__} = q{123};
- $gnucref->{__GNUC_MINOR__} = q{456};
- capture ( sub {$rv = $step->_evaluate_gcc($conf, $gnucref) }, \$stdout);
- ok($rv, "_evaluate_gcc() returned true value");
- ok(defined $conf->data->get( 'gccversion' ),
- "gccversion defined as expected");
- is($conf->data->get( 'gccversion' ), q{123.456},
- "Got expected value for gccversion");
- like($step->result(), qr/^yes/, "Got expected result");
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc(); --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- my $rv;
- my $stdout;
- my $gnucref = {};
- $gnucref->{__GNUC__} = q{123};
- $gnucref->{__GNUC_MINOR__} = q{456};
- capture ( sub {$rv = $step->_evaluate_gcc($conf, $gnucref) }, \$stdout);
- ok($rv, "_evaluate_gcc() returned true value");
- ok( !$stdout, "verbose output captured" );
- ok(defined $conf->data->get( 'gccversion' ),
- "gccversion defined as expected");
- is($conf->data->get( 'gccversion' ), q{123.456},
- "Got expected value for gccversion");
- like($step->result(), qr/^yes/, "Got expected result");
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$gnucref = {};
-$gnucref->{__GNUC__} = q{abc123};
-ok($step->_evaluate_gcc($conf, $gnucref),
- "_evaluate_gcc() returned true value");
-ok(! defined $conf->data->get( 'gccversion' ),
- "gccversion undef as expected");
-is($step->result(), q{no}, "Got expected result");
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc(); maintaiiner; cage ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--maintainer}, q{--cage} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$gnucref = {};
-$gnucref->{__GNUC__} = q{3};
-$gnucref->{__GNUC_MINOR__} = q{1};
-$conf->data->set( ccwarn => q{-Wfoobar -Wnofoobaz} );
-ok($step->_evaluate_gcc($conf, $gnucref),
- "_evaluate_gcc() returned true value");
-ok(defined $conf->data->get( 'gccversion' ),
- "gccversion defined as expected");
-like($step->result(), qr/^yes/, "Got expected result");
-
-$conf->replenish($serialized);
-
-########## _evaluate_gcc() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$gnucref = {};
-$gnucref->{__GNUC__} = q{3};
-$gnucref->{__GNUC_MINOR__} = q{1};
-{
- $conf->data->set_p5( OSNAME => 'hpux' );
- ok($step->_evaluate_gcc($conf, $gnucref),
- "_evaluate_gcc() returned true value");
- ok(defined $conf->data->get( 'gccversion' ),
- "gccversion defined as expected");
- is($conf->data->get( 'gccversion' ), q{3.1},
- "Got expected value for gccversion");
- like($step->result(), qr/^yes/, "Got expected result");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_gcc-01.t - test auto::gcc
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_gcc-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::gcc.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::gcc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_gdbm-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gdbm-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,201 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_gdbm-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 47;
-use Carp;
-use Cwd;
-use File::Spec;
-use File::Temp qw( tempdir );
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::gdbm');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-=for hints_for_testing The documentation for this package is skimpy;
-please try to improve it, e.g., by providing a short description of what
-the 'gdbm' is. Some branches are compiler- or OS-specific. As noted in
-a comment in the module, please consider the issues raised in
-http://rt.perl.org/rt3/Ticket/Display.html?id=43134.
-
-=cut
-
-########## --without-gdbm ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ q{--without-gdbm} ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::gdbm};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('has_gdbm'), 0,
- "Got expected value for 'has_gdbm'");
-is($step->result(), q{no}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########## --without-gdbm; _handle_darwin_for_fink() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--without-gdbm} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $osname;
-my ($flagsbefore, $flagsafter);
-$osname = 'foobar';
-$flagsbefore = $conf->data->get( 'linkflags' );
-ok($step->_handle_darwin_for_fink($conf, $osname, 'gdbm.h'),
- "handle_darwin_for_fink() returned true value");
-$flagsafter = $conf->data->get( 'linkflags' );
-is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- ok(chdir $tdir, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $tdir, 'lib' );
- my $includedir = File::Spec->catdir( $tdir, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => $includedir);
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'gdbm.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-{
- my $tdir2 = tempdir( CLEANUP => 1 );
- ok(chdir $tdir2, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $tdir2, 'lib' );
- my $includedir = File::Spec->catdir( $tdir2, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => $includedir);
- my $foo = File::Spec->catfile( $includedir, 'gdbm.h' );
- open my $FH, ">", $foo or croak "Could not open for writing";
- print $FH "Hello world\n";
- close $FH or croak "Could not close after writing";
-
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'gdbm.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- isnt($flagsbefore, $flagsafter, "Change in linkflags, as expected");
- like($conf->data->get( 'linkflags' ), qr/-L\Q$libdir\E/,
- "'linkflags' modified as expected");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-$conf->replenish($serialized);
-
-########## --without-gdbm; _evaluate_cc_run() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--without-gdbm} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my ($test, $has_gdbm, $verbose);
-$test = qq{gdbm is working.\n};
-$has_gdbm = 0;
-$verbose = undef;
-$has_gdbm = $step->_evaluate_cc_run($test, $has_gdbm, $verbose);
-is($has_gdbm, 1, "'has_gdbm' set as expected");
-is($step->result(), 'yes', "Expected result was set");
-# Prepare for next test
-$step->set_result(undef);
-$test = qq{foobar};
-$has_gdbm = 0;
-$verbose = undef;
-$has_gdbm = $step->_evaluate_cc_run($test, $has_gdbm, $verbose);
-is($has_gdbm, 0, "'has_gdbm' set as expected");
-ok(! defined $step->result(), "Result is undefined, as expected");
-{
- my $stdout;
- $test = qq{gdbm is working.\n};
- $has_gdbm = 0;
- $verbose = 1;
- capture(
- sub { $has_gdbm =
- $step->_evaluate_cc_run($test, $has_gdbm, $verbose); },
- \$stdout,
- );
- is($has_gdbm, 1, "'has_gdbm' set as expected");
- is($step->result(), 'yes', "Expected result was set");
- like($stdout, qr/\(yes\)/, "Got expected verbose output");
- # Prepare for next test
- $step->set_result(undef);
-}
-
-$conf->replenish($serialized);
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_gdbm-01.t - test auto::gdbm
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_gdbm-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::gdbm.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::gdbm, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_gettext-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gettext-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,217 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_gettext-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 30;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::gettext');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########## --without-gettext ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--without-gettext} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::gettext};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('has_gettext'), 0,
- "Got expected value for 'has_gettext'");
-is($step->result(), q{no}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########## _select_lib() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-# Mock values for OS and C-compiler
-my ($osname, $cc, $initial_value);
-$osname = 'mswin32';
-$cc = 'gcc';
-$initial_value = $conf->data->get( 'libs' );
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_gcc => '-lintl',
- win32_nongcc => 'intl.lib',
- default => defined $conf->data->get('glibc') ? '' : '-lintl',
-} ),
- '-lintl',
- "_select_lib() returned expected value");
-
-$osname = 'mswin32';
-$cc = 'cc';
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_gcc => '-lintl',
- win32_nongcc => 'intl.lib',
- default => defined $conf->data->get('glibc') ? '' : '-lintl',
-} ),
- 'intl.lib',
- "_select_lib() returned expected value");
-
-$osname = 'foobar';
-$cc = 'cc';
-$conf->data->set( glibc => 1 );
-isnt($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_gcc => '-lintl',
- win32_nongcc => 'intl.lib',
- default => defined $conf->data->get('glibc') ? '' : '-lintl',
-} ),
- '-lintl',
- "_select_lib() returned expected value");
-
-$osname = 'foobar';
-$cc = 'cc';
-$conf->data->set( glibc => undef );
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_gcc => '-lintl',
- win32_nongcc => 'intl.lib',
- default => defined $conf->data->get('glibc') ? '' : '-lintl',
-} ),
- '-lintl',
- "_select_lib() returned expected value");
-
-########## _evaluate_cc_run() ##########
-
-my ($test, $verbose);
-my $has_gettext;
-
-$test = "Hello, world!\n";
-$verbose = undef;
-$has_gettext = $step->_evaluate_cc_run($test, $verbose);
-is($has_gettext, 1, "Got expected value for has_gettext");
-is($step->result(), 'yes', "Expected result was set");
-# Prepare for next test
-$step->set_result(undef);
-
-{
- my $stdout;
- $test = "Hello, world!\n";
- $verbose = 1;
- capture(
- sub {
- $has_gettext = $step->_evaluate_cc_run($test, $verbose);
- },
- \$stdout,
- );
- is($has_gettext, 1, "Got expected value for has_gettext");
- is($step->result(), 'yes', "Expected result was set");
- like($stdout, qr/\(yes\)/, "Got expected verbose output");
- # Prepare for next test
- $step->set_result(undef);
-}
-
-$test = "Foobar\n";
-$verbose = undef;
-$has_gettext = $step->_evaluate_cc_run($test, $verbose);
-is($has_gettext, 0, "Got expected value for has_gettext");
-ok(! defined $step->result(), "As expected, result is not yet defined");
-
-$conf->replenish($serialized);
-
-########## --without-gettext; _handle_gettext() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--without-gettext} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$verbose = undef;
-$conf->data->set( ccflags => q{} );
-ok(auto::gettext::_handle_gettext($conf, $verbose),
- "_handle_gettext() returned true value");
-like($conf->data->get( 'ccflags' ), qr/-DHAS_GETTEXT/,
- "HAS_GETTEXT was added to 'ccflags'");
-
-{
- my ($stdout, $rv);
- $verbose = 1;
- capture(
- sub { $rv = auto::gettext::_handle_gettext($conf, $verbose); },
- \$stdout,
- );
- ok($rv, "_handle_gettext() returned true value");
- like($conf->data->get( 'ccflags' ), qr/-DHAS_GETTEXT/,
- "HAS_GETTEXT was added to 'ccflags'");
- like($stdout,
- qr/ccflags:\s.*-DHAS_GETTEXT/,
- "Got expected verbose output"
- );
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_gettext-01.t - test auto::gettext
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_gettext-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::gettext.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::gettext, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_glibc-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_glibc-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,94 +0,0 @@
-#! perl
-# Copyright (C) 2008, Parrot Foundation.
-# $Id$
-# auto_glibc-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 18;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::glibc');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my ($task, $step_name, $step, $ret);
-my $pkg = q{auto::glibc};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-ok($step->runstep($conf), "runstep() returned true value");
-
-$conf->replenish($serialized);
-
-########## _evaluate_glibc() ##########
-
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-
-my $test = {};
-$test->{glibc} = 1;
-$step->_evaluate_glibc($conf, $test);
-is( $step->result(), q{yes}, "Got expected result" );
-is( $conf->data->get( 'glibc' ), 1, "Got expected value for 'glibc'" );
-
-$test->{glibc} = undef;
-$step->_evaluate_glibc($conf, $test);
-is( $step->result(), q{no}, "Got expected result" );
-ok( ! defined $conf->data->get( 'glibc' ),
- "'glibc' undefined as expected" );
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_glibc-01.t - test auto::glibc
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_glibc-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::glibc.
-
-=head1 AUTHOR
-
-Jerry Gay
-
-=head1 SEE ALSO
-
-config::auto::glibc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_gmp-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_gmp-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,306 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_gmp-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 61;
-use Carp;
-use Cwd;
-use File::Spec;
-use File::Temp qw( tempdir );
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::gmp');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-=for hints_for_testing The documentation for this package is skimpy;
-please try to improve it, e.g., by providing a link to an introduction
-to the GNU MP library.
-
-=cut
-
-########### --without-gmp ###########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ q{--without-gmp} ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::gmp};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($conf->data->get('has_gmp'), 0,
- "Got expected value for 'has_gmp'");
-is($step->result(), q{no}, "Expected result was set");
-
-$conf->replenish($serialized);
-
-########### _select_lib() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-# Mock values for OS and C-compiler
-my ($osname, $cc, $initial_value);
-$osname = 'mswin32';
-$cc = 'gcc';
-$initial_value = $conf->data->get( 'libs' );
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'gmp.lib',
- default => '-lgmp',
-} ),
- '-lgmp',
- "_select_lib() returned expected value");
-
-$osname = 'mswin32';
-$cc = 'cc';
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'gmp.lib',
- default => '-lgmp',
-} ),
- 'gmp.lib',
- "_select_lib() returned expected value");
-
-$osname = 'foobar';
-$cc = undef;
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'gmp.lib',
- default => '-lgmp',
-} ),
- '-lgmp',
- "_select_lib() returned expected value");
-
-########### _handle_darwin_for_fink() ###########
-
-my ($flagsbefore, $flagsafter);
-$osname = 'foobar';
-$flagsbefore = $conf->data->get( 'linkflags' );
-ok($step->_handle_darwin_for_fink($conf, $osname, 'gmp.h'),
- "handle_darwin_for_fink() returned true value");
-$flagsafter = $conf->data->get( 'linkflags' );
-is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- ok(chdir $tdir, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $tdir, 'lib' );
- my $includedir = File::Spec->catdir( $tdir, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => $includedir);
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'gmp.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-{
- my $tdir2 = tempdir( CLEANUP => 1 );
- ok(chdir $tdir2, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $tdir2, 'lib' );
- my $includedir = File::Spec->catdir( $tdir2, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => $includedir);
- my $foo = File::Spec->catfile( $includedir, 'gmp.h' );
- open my $FH, ">", $foo or croak "Could not open for writing";
- print $FH "Hello world\n";
- close $FH or croak "Could not close after writing";
-
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'gmp.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- isnt($flagsbefore, $flagsafter, "Change in linkflags, as expected");
- like($conf->data->get( 'linkflags' ), qr/-L\Q$libdir\E/,
- "'linkflags' modified as expected");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-$conf->replenish($serialized);
-
-########### _evaluate_cc_run() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my ($test, $has_gmp, $verbose);
-
-$test = $step->{cc_run_expected};
-$has_gmp = 0;
-$verbose = undef;
-$has_gmp = $step->_evaluate_cc_run($conf, $test, $has_gmp, $verbose);
-is($step->result, 'yes', "Got expected result");
-is($conf->data->get('gmp'), 'define', "Expected value set for 'gmp'");
-is($conf->data->get('HAS_GMP'), 1, "Expected value set for 'HAS_GMP'");
-# prepare for next test
-$conf->data->set('gmp' => undef);
-$conf->data->set('HAS_GMP' => undef);
-$step->set_result(undef);
-
-$test = '12345';
-$has_gmp = 0;
-$verbose = undef;
-$has_gmp = $step->_evaluate_cc_run($conf, $test, $has_gmp, $verbose);
-ok(! defined($step->result), "Result undefined as expected");
-is($has_gmp, 0, "gmp status unchanged");
-
-{
- my $stdout;
- $test = $step->{cc_run_expected};
- $has_gmp = 0;
- $verbose = 1;
- capture(
- sub { $has_gmp =
- $step->_evaluate_cc_run($conf, $test, $has_gmp, $verbose); },
- \$stdout,
- );
- is($step->result, 'yes', "Got expected result");
- is($conf->data->get('gmp'), 'define', "Expected value set for 'gmp'");
- is($conf->data->get('HAS_GMP'), 1, "Expected value set for 'HAS_GMP'");
- like($stdout, qr/\(yes\)/, "Got expected verbose output");
- # prepare for next test
- $conf->data->set('gmp' => undef);
- $conf->data->set('HAS_GMP' => undef);
- $step->set_result(undef);
-}
-
-########### _handle_darwin_for_fink() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-# Mock values for OS
-$osname = 'darwin';
-$conf->data->set( 'linkflags' => 'foobar' );
-$flagsbefore = $conf->data->get( 'linkflags' );
-$conf->data->set( fink_lib_dir => undef );
-$conf->data->set( fink_include_dir => undef );
-ok($step->_handle_darwin_for_fink($conf, $osname, 'gmp.h'),
- "handle_darwin_for_fink() returned true value");
-$flagsafter = $conf->data->get( 'linkflags' );
-is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-
-$cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- ok(chdir $tdir, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
-# ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $tdir, 'lib' );
- my $includedir = File::Spec->catdir( $tdir, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => $includedir);
- $osname = 'darwin';
- $conf->data->set( 'linkflags' => 'foobar' );
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'gmp.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-{
- my $tdir1 = tempdir( CLEANUP => 1 );
- ok(chdir $tdir1, "Able to change to temporary directory");
-# ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $tdir1, 'lib' );
- my $includedir = File::Spec->catdir( $tdir1, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => $includedir);
- $osname = 'darwin';
- $conf->data->set( 'linkflags' => 'foobar' );
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'gmp.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_gmp-01.t - test auto::gmp
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_gmp-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::gmp.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::gmp, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_headers-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_headers-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,132 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_headers-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 30;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::headers');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw | capture |;
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-my $pkg = q{auto::headers};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{}, "Result is empty string as expected");
-
-$conf->replenish($serialized);
-
-########## --verbose ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--verbose} ],
- mode => q{configure},
- }
-);
-
-rerun_defaults_for_testing($conf, $args );
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf) }, \$stdout);
- ok( $stdout, "verbose output captured" );
- ok( $rv, "runstep() returned true value" );
- is($step->result(), q{}, "Result is empty string as expected");
-}
-
-$conf->replenish($serialized);
-
-########## _set_from_Config(); _list_extra_headers() ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-rerun_defaults_for_testing($conf, $args );
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-auto::headers::_set_from_Config($conf);
-ok(! $conf->data->get('i_niin'), "Mapping made correctly");
-
-{
- $conf->data->set_p5( OSNAME => "msys" );
- my %extra_headers =
- map {$_, 1} auto::headers::_list_extra_headers($conf);
- ok($extra_headers{'sysmman.h'}, "Special header set for msys");
- ok($extra_headers{'netdb.h'}, "Special header set for msys");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_headers-01.t - test auto::headers
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_headers-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::headers.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::headers, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_icu-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_icu-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,723 +0,0 @@
-#! perl
-# Copyright (C) 2007-2008, Parrot Foundation.
-# $Id$
-# auto_icu-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 136;
-use Carp;
-use Cwd;
-use File::Path qw( mkpath );
-use File::Temp qw( tempdir );
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::icu');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use Parrot::Configure::Utils qw( capture_output );
-use IO::CaptureOutput qw( capture );
-
-########## --without-icu ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--without-icu} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::icu};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-
-is( $conf->data->get('has_icu'), 0,
- "Got expected value for 'has_icu'" );
-is( $conf->data->get('icu_shared'), q{},
- "Got expected value for 'icu_shared'" );
-is( $conf->data->get('icu_dir'), q{},
- "Got expected value for 'icu_dir'" );
-is( $step->result(), 'not requested', "Got expected result" );
-$step->set_result(q{}); # prepare for subsequent tests
-
-########## _handle_icuconfig_opt() ##########
-
-# Test some internal routines
-my $icuconfig;
-my $phony = q{/path/to/icu-config};
-
-is($step->_handle_icuconfig_opt(undef), q{},
- "Got expected value for icu-config");
-is($step->_handle_icuconfig_opt('none'), q{},
- "Got expected value for icu-config");
-is($step->_handle_icuconfig_opt($phony), $phony,
- "Got expected value for icu-config");
-
-########## _handle_search_for_icuconfig() ##########
-
-my ($autodetect, $without);
-
-($icuconfig, $autodetect, $without) =
- $step->_handle_search_for_icu_config( {
- icuconfig => q{},
- autodetect => 1,
- without => 0,
- verbose => 0,
- ret => -1,
-} );
-ok(! defined $icuconfig, "icu-config not found, as expected");
-is($autodetect, 0, "Autodetection cancelled, as expected");
-is($without, 1, "Continuing to configure without ICU");
-
-($icuconfig, $autodetect, $without) =
- $step->_handle_search_for_icu_config( {
- icuconfig => q{},
- autodetect => 1,
- without => 0,
- verbose => 0,
- ret => 256,
-} );
-ok(! defined $icuconfig, "icu-config not found, as expected");
-is($autodetect, 0, "Autodetection cancelled, as expected");
-is($without, 1, "Continuing to configure without ICU");
-
-($icuconfig, $autodetect, $without) =
- $step->_handle_search_for_icu_config( {
- icuconfig => q{},
- autodetect => 1,
- without => 0,
- verbose => 0,
- ret => 0,
-} );
-is($icuconfig, q{icu-config}, "icu-config found, as expected");
-is($autodetect, 1, "Autodetection continues, as expected");
-is($without, 0, "Continuing to try to configure with ICU");
-
-{
- my ($stdout, $stderr);
- capture( sub {
- ($icuconfig, $autodetect, $without) =
- $step->_handle_search_for_icu_config( {
- icuconfig => q{},
- autodetect => 1,
- without => 0,
- verbose => 1,
- ret => 0,
- } );
- },
- \$stdout,
- \$stderr,
- );
- is($icuconfig, q{icu-config}, "icu-config found, as expected");
- is($autodetect, 1, "Autodetection continues, as expected");
- is($without, 0, "Continuing to try to configure with ICU");
- like($stdout, qr/icu-config found/,
- "Got expected verbose output");
-}
-
-########## _handle_autodetect() ##########
-
-($icuconfig, $autodetect, $without) =
- $step->_handle_autodetect( {
- icuconfig => $phony,
- autodetect => 1,
- without => 0,
- verbose => 0,
-} );
-is($icuconfig, $phony, "icu-config unchanged, as expected");
-is($autodetect, 1, "Autodetection still active, as expected");
-is($without, 0, "Continuing to try to configure with ICU");
-
-{
- my ($stdout, $stderr);
- capture( sub {
- ($icuconfig, $autodetect, $without) =
- $step->_handle_autodetect( {
- icuconfig => $phony,
- autodetect => 0,
- without => 0,
- verbose => 1,
- } );
- },
- \$stdout,
- \$stderr,
- );
- is($icuconfig, $phony, "icu-config unchanged, as expected");
- is($autodetect, 0, "Autodetection still inactive, as expected");
- is($without, 0, "Continuing to try to configure with ICU");
- like($stdout, qr/ICU autodetection disabled/s,
- "Got expected verbose output");
-}
-
-########## _handle_icushared() ##########
-
-my $icushared;
-
-$icushared = qq{-licui18n -lalpha\n};
-($icushared, $without) = $step->_handle_icushared($icushared, 0);
-like($icushared, qr/-lalpha/, "Got expected ld flags");
-is($without, 0, "Continuing to try to configure with ICU");
-
-$icushared = qq{-licui18n\n};
-($icushared, $without) = $step->_handle_icushared($icushared, 0);
-ok(! $icushared, "No icushared, as expected");
-is($without, 1, "No longer trying to configure with ICU");
-
-$icushared = undef;
-($icushared, $without) = $step->_handle_icushared($icushared, 0);
-ok(! defined $icushared, "icushared remains undefined, as expected");
-is($without, 0, "Continuing to try to configure with ICU");
-
-########## _handle_icuheaders() ##########
-
-my $icuheaders;
-($icuheaders, $without) =
- $step->_handle_icuheaders($conf, undef, 0);
-ok(! defined $icuheaders, "icuheaders path undefined, as expected");
-is($without, 0, "Continuing to try to configure with ICU");
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $expected_dir = q{alpha};
- my $expected_include_dir =
- $expected_dir . $conf->data->get('slash') . q{include};
- ($icuheaders, $without) =
- $step->_handle_icuheaders($conf, qq{$expected_dir\n}, 0);
- is($icuheaders, $expected_include_dir,
- "Got expected icuheaders path value");
- is($without, 1, "No longer trying to configure with ICU");
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $expected_dir = q{alpha};
- my $expected_include_dir =
- $expected_dir . $conf->data->get('slash') . q{include};
- mkdir $expected_dir or croak "Unable to make testing directory";
- ($icuheaders, $without) =
- $step->_handle_icuheaders($conf, qq{$expected_dir\n}, 0);
- is($icuheaders, $expected_include_dir,
- "Got expected icuheaders path value");
- is($without, 1, "No longer trying to configure with ICU");
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1);
- chdir $tdir or croak "Unable to change to temporary directory";
- my $expected_dir = q{alpha};
- my $expected_include_dir =
- $expected_dir . $conf->data->get('slash') . q{include};
- mkdir $expected_dir or croak "Unable to make testing directory";
- mkpath($expected_include_dir, { mode => 0755 })
- or croak "Unable to make second-level testing directory";
- ($icuheaders, $without) =
- $step->_handle_icuheaders($conf, qq{$expected_dir\n}, 0);
- is($icuheaders, $expected_include_dir,
- "Got expected icuheaders path value");
- is($without, 0, "Continuing to try to configure with ICU");
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-########## _try_icuconfig() ##########
-
-($without, $icushared, $icuheaders) =
- $step->_try_icuconfig(
- $conf,
- {
- without => 1,
- autodetect => 1,
- icuconfig => 1,
- verbose => 0,
- }
- );
-is($without, 1, "Not trying to configure with ICU");
-ok(! defined $icushared, "icushared undefined, as expected");
-ok(! defined $icuheaders, "icuheaders undefined, as expected");
-is($step->result(), q{}, "result is still empty string, as expected");
-
-($without, $icushared, $icuheaders) =
- $step->_try_icuconfig(
- $conf,
- {
- without => 0,
- autodetect => 0,
- icuconfig => 1,
- verbose => 0,
- }
- );
-is($without, 0, "Still trying to configure with ICU");
-ok(! defined $icushared, "icushared undefined, as expected");
-ok(! defined $icuheaders, "icuheaders undefined, as expected");
-is($step->result(), q{}, "result is still empty string, as expected");
-
-($without, $icushared, $icuheaders) =
- $step->_try_icuconfig(
- $conf,
- {
- without => 0,
- autodetect => 1,
- icuconfig => q{},
- verbose => 0,
- }
- );
-is($without, 0, "Still trying to configure with ICU");
-ok(! defined $icushared, "icushared undefined, as expected");
-ok(! defined $icuheaders, "icuheaders undefined, as expected");
-is($step->result(), q{}, "result is still empty string, as expected");
-
-########## _verbose_report() ##########
-
-my $die = auto::icu::_die_message();
-like($die, qr/Something is wrong with your ICU installation/s,
- "Got expected die message");
-
-{
- my $phony = q{/path/to/icu-config};
- my ($stdout, $stderr);
- capture(
- sub { auto::icu::_verbose_report(1, $phony, undef, undef); },
- \$stdout,
- \$stderr,
- );
- like( $stdout, qr/icuconfig:\s+$phony/s,
- "Got expected verbose output"
- );
-}
-
-{
- my $phony = q{-lalpha};
- my ($stdout, $stderr);
- capture(
- sub { auto::icu::_verbose_report(1, undef, $phony, undef); },
- \$stdout,
- \$stderr,
- );
- like( $stdout, qr/icushared='$phony'/s,
- "Got expected verbose output"
- );
-}
-
-{
- my $phony = q{alpha/include};
- my ($stdout, $stderr);
- capture(
- sub { auto::icu::_verbose_report(1, undef, undef, $phony); },
- \$stdout,
- \$stderr,
- );
- like( $stdout, qr/headers='$phony'/s,
- "Got expected verbose output"
- );
-}
-
-{
- my ($stdout, $stderr);
- capture(
- sub { auto::icu::_verbose_report(0, 'alpha', 'beta', 'gamma'); },
- \$stdout,
- \$stderr,
- );
- ok(! $stdout, "No verbose output, as expected");
-}
-
-########## _handle_icuconfig_errors() ##########
-
-{
- my ($stdout, $stderr);
- capture(
- sub {
- $icuheaders = $step->_handle_icuconfig_errors( {
- icushared => undef,
- icuheaders => undef,
- } );
- },
- \$stdout,
- \$stderr,
- );
- like($stderr, qr/error: icushared not defined/s,
- "Got expected warnings");
- like($stderr, qr/error: icuheaders not defined or invalid/s,
- "Got expected warnings");
- like($stderr, qr/Something is wrong with your ICU installation/s,
- "Got expected warnings");
-}
-
-########## _handle_ccflags_status() ##########
-
-$icuheaders = q{alpha};
-my $status = $conf->data->get( 'ccflags' );
-
-{
- my ($stdout, $stderr);
- capture(
- sub {
- auto::icu::_handle_ccflags_status($conf,
- {
- ccflags_status => 1,
- verbose => 1,
- icuheaders => $icuheaders,
- },
- );
- },
- \$stdout,
- \$stderr,
- );
- like($stdout, qr/Your compiler found the icu headers/,
- "Got expected verbose output");
-}
-$conf->data->set( ccflags => $status ); # re-set for next test
-
-{
- my ($stdout, $stderr);
- capture(
- sub {
- auto::icu::_handle_ccflags_status($conf,
- {
- ccflags_status => 0,
- verbose => 1,
- icuheaders => $icuheaders,
- },
- );
- },
- \$stdout,
- \$stderr,
- );
-
- if ($icuheaders =~ /\s/) {
- like($stdout, qr/Adding -I \"\Q$icuheaders\E\" to ccflags for icu headers/,
- "Got expected verbose output");
- }
- else {
- like($stdout, qr/Adding -I \Q$icuheaders\E to ccflags for icu headers/,
- "Got expected verbose output");
- }
-}
-if ($icuheaders =~ /\s/) {
- like($conf->data->get( 'ccflags' ),
- qr/-I \"\Q$icuheaders\E\"/,
- "ccflags augmented as expected"
- );
-}
-else {
- like($conf->data->get( 'ccflags' ),
- qr/-I \Q$icuheaders\E/,
- "ccflags augmented as expected"
- );
-}
-$conf->data->set( ccflags => $status ); # re-set for next test
-
-{
- my ($stdout, $stderr);
- capture(
- sub {
- auto::icu::_handle_ccflags_status($conf,
- {
- ccflags_status => 0,
- verbose => 0,
- icuheaders => $icuheaders,
- },
- );
- },
- \$stdout,
- \$stderr,
- );
-
- ok(! $stdout, "No verbose output, as expected");
-}
-
-if ($icuheaders =~ /\s/) {
- like($conf->data->get( 'ccflags'),
- qr/-I \"\Q$icuheaders\E\"/,
- "ccflags augmented as expected"
- );
-}
-else {
- like($conf->data->get( 'ccflags'),
- qr/-I \Q$icuheaders\E/,
- "ccflags augmented as expected"
- );
-}
-$conf->data->set( ccflags => $status ); # re-set for next test
-
-########## _set_no_configure_with_icu() ##########
-
-$conf->data->set( 'has_icu', undef );
-$conf->data->set( 'icu_shared', undef );
-$conf->data->set( 'icu_dir', undef );
-my $result = q{hooray!};
-$step->_set_no_configure_with_icu($conf, $result);
-is($conf->data->get( 'has_icu' ), 0,
- "Got expected value for 'has_icu'");
-is($conf->data->get( 'icu_shared' ), q{},
- "Got expected value for 'icu_shared'");
-is($conf->data->get( 'icu_dir' ), q{},
- "Got expected value for 'icu_dir'");
-is($step->{result}, $result, "Got expected result");
-# reset for next test
-$conf->data->set( 'has_icu', undef );
-$conf->data->set( 'icu_shared', undef );
-$conf->data->set( 'icu_dir', undef );
-
-$conf->replenish($serialized);
-
-########## --without-icu; --icu-config=none ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--without-icu}, q{--icu-config=none} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-
-is( $conf->data->get('has_icu'), 0,
- "Got expected value for 'has_icu'" );
-is( $conf->data->get('icu_shared'), q{},
- "Got expected value for 'icu_shared'" );
-is( $conf->data->get('icu_dir'), q{},
- "Got expected value for 'icu_dir'" );
-is( $step->result(), 'not requested', "Got expected result" );
-
-$conf->replenish($serialized);
-
-########## --icu-config=1; --icuheaders; --icushared ##########
-
-{
- my ($stdout, $stderr, $ret);
- eval { ($stdout, $stderr, $ret) =
- capture_output( qw| icu-config --exists | ); };
- SKIP: {
- skip "icu-config not available", 9 if $stderr;
- ($args, $step_list_ref) = process_options( {
- argv => [
- q{--icu-config=1},
- q{--icuheaders=alpha},
- q{--icushared=beta}
- ],
- mode => q{configure},
- } );
- rerun_defaults_for_testing($conf, $args );
- $conf->add_steps($pkg);
- $conf->options->set( %{$args} );
- $step = test_step_constructor_and_description($conf);
- {
- my ($stdout, $stderr, $ret);
- capture(
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- \$stderr,
- );
- ok(! defined $ret, "runstep() returned undefined value as expected");
- like($stderr, qr/error: icuheaders not defined or invalid/s,
- "Got expected warnings");
- like($stderr, qr/Something is wrong with your ICU installation/s,
- "Got expected warnings");
- }
- }
-}
-
-$conf->replenish($serialized);
-
-########## --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$phony = q{phony};
-$step->{icuconfig_default} = $phony;
-
-{
- my ($stdout, $stderr);
- my $ret;
- capture(
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- \$stderr,
- );
- ok( $ret, "runstep() returned true value" );
- my $expected = q{no icu-config};
- is($step->result(), $expected,
- "Got expected return value: $expected");
- like($stdout,
- qr/Discovered $step->{icuconfig_default} --exists returns/s,
- "Got expected verbose output re return value",
- );
- like($stdout,
- qr/Could not locate an icu-config program/s,
- "Got expected verbose output re inability to locate icu-config program",
- );
-}
-$step->set_result( q{} );
-
-$conf->options->set( verbose => undef );
-{
- my ($stdout, $stderr);
- my $ret;
- capture(
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- \$stderr,
- );
- ok( $ret, "runstep() returned true value" );
- my $expected = q{no icu-config};
- is($step->result(), $expected,
- "Got expected return value: $expected");
- ok(! $stdout, "No verbose output captured, as expected");
-}
-
-$conf->replenish($serialized);
-
-########## --icuheaders ##########
-
-{
- my ($stdout, $stderr, $ret);
- eval { ($stdout, $stderr, $ret) =
- capture_output( qw| icu-config --exists | ); };
- SKIP: {
- skip "icu-config not available", 10 if $stderr;
- ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--icuheaders=alpha}, ],
- mode => q{configure},
- }
- );
-
- rerun_defaults_for_testing($conf, $args );
- $conf->add_steps($pkg);
- $conf->options->set( %{$args} );
- $step = test_step_constructor_and_description($conf);
-
- {
- my ($stdout, $stderr, $ret);
- capture(
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- \$stderr,
- );
- ok(! defined $ret, "runstep() returned undefined value as expected");
- like($stderr, qr/error: icushared not defined/s,
- "Got expected warnings");
- like($stderr, qr/error: icuheaders not defined or invalid/s,
- "Got expected warnings");
- like($stderr, qr/Something is wrong with your ICU installation/s,
- "Got expected warnings");
- }
- }
-}
-
-$conf->replenish($serialized);
-
-########## --verbose; _try_icuconfig() ##########
-
-{
- my ($stdout, $stderr, $ret);
- eval { ($stdout, $stderr, $ret) =
- capture_output( qw| icu-config --exists | ); };
- SKIP: {
- skip "icu-config not available", 12 if $stderr;
- ($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose}, ],
- mode => q{configure},
- } );
- rerun_defaults_for_testing($conf, $args );
- $conf->add_steps($pkg);
- $conf->options->set( %{$args} );
- $step = test_step_constructor_and_description($conf);
- {
- my ($stdout, $stderr, $ret);
- my $icuconfig;
- my ($without, $icushared, $icuheaders);
- capture(
- sub {
- $icuconfig = $step->_handle_icuconfig_opt(1);
- ($without, $icushared, $icuheaders) = $step->_try_icuconfig(
- $conf,
- {
- without => 0,
- autodetect => 1,
- icuconfig => $icuconfig,
- verbose => 1,
- }
- );
- },
- \$stdout,
- \$stderr,
- );
- like($stdout, qr/Trying $icuconfig with '--ldflags'/s,
- "Got expected verbose output re --ldflags");
- like($stdout, qr/icushared: captured/s,
- "Got expected verbose output re icushared");
- like($stdout, qr/For icushared, found \Q$icushared\E and $without/s,
- "Got expected verbose output re icushared");
- like($stdout, qr/Trying $icuconfig with '--prefix'/s,
- "Got expected verbose output re --prefix");
- like($stdout, qr/icuheaders: captured/s,
- "Got expected verbose output re icuheaders");
- like($stdout, qr/For icuheaders, found \Q$icuheaders\E and $without/s,
- "Got expected verbose output re icuheaders");
- }
- }
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_icu-01.t - test auto::icu
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_icu-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::icu.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::icu, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_inline-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_inline-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,165 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_inline-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 37;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::inline');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########### regular ###########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::inline};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-
-$conf->replenish($serialized);
-
-########### --inline ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--inline} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-
-$conf->replenish($serialized);
-
-########### _evaluate_inline() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $test = 1;
-ok($step->_evaluate_inline($conf, $test),
- "_evaluate_inline() returned true value");
-is($step->result, q{yes}, "Got expected result");
-is($conf->data->get( 'inline' ), 1,
- "'inline' attribute has expected value");;
-
-$conf->replenish($serialized);
-
-########### _evaluate_inline() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$test = 0;
-ok($step->_evaluate_inline($conf, $test),
- "_evaluate_inline() returned true value");
-is($step->result, q{no}, "Got expected result");
-is($conf->data->get( 'inline' ), q{},
- "'inline' attribute has expected value");;
-
-$conf->replenish($serialized);
-
-########### _evaluate_inline(); --verbose ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $test = 1;
- my $stdout;
- my $ret = capture(
- sub { $step->_evaluate_inline($conf, $test) },
- \$stdout
- );
- ok($ret, "_evaluate_inline() returned true value");
- is($step->result, q{yes}, "Got expected result");;
- is($conf->data->get( 'inline' ), 1,
- "'inline' attribute has expected value");
-}
-
-$conf->replenish($serialized);
-
-########### _second_probe_for_inline(); _evaluate_inline() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$test = 0;
-$test = $step->_second_probe_for_inline($conf, $test);
-ok($step->_evaluate_inline($conf, $test),
- "_evaluate_inline() returned true value");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_inline-01.t - test auto::inline
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_inline-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::inline.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::inline, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_isreg-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_isreg-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,116 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_isreg-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 23;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::isreg');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::isreg};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-ok($step->runstep($conf), "runstep() returned true value");
-
-$conf->replenish($serialized);
-
-########## _evaluate_isreg() ##########
-
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- my $anyerror;
- my $stdout;
- my $ret = capture(
- sub { $step->_evaluate_isreg($conf, $anyerror) },
- \$stdout
- );
- ok($ret, "_evaluate_isreg returned true value");
- is($conf->data->get('isreg'), 1, "'isreg' set to true value as expected");
- is($step->result, 'yes', "Got expected result");
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_isreg(); --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-{
- my $anyerror = 1;
- my $stdout;
- my $ret = capture(
- sub { $step->_evaluate_isreg($conf, $anyerror) },
- \$stdout
- );
- ok($ret, "_evaluate_isreg returned true value");
- is($conf->data->get('isreg'), 0, "'isreg' set to false value as expected");
- is($step->result, 'no', "Got expected result");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_isreg-01.t - test auto::isreg
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_isreg-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::isreg.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::isreg, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_jit-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_jit-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,396 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_jit-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 51;
-use Carp;
-use Cwd;
-use File::Path qw( mkpath );
-use File::Temp qw( tempdir );
-use File::Spec;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::jit');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::jit};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-########### _check_jitcapability() ###########
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'bar';
- my $osname = 'baz';
- my $corejitdir = File::Spec->catdir ( $jitbase, $cpuarch );
- mkpath( $corejitdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- my $corejit = File::Spec->catfile( $jitbase, $cpuarch, q{core.jit} );
- is( $step->_check_jitcapability($corejit, $cpuarch, $osname, 8), 0,
- "Got expected value for _check_jitcapability(): no core.jit case");
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'bar';
- my $osname = 'baz';
- my $corejitdir = File::Spec->catdir ( $jitbase, $cpuarch );
- mkpath( $corejitdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- my $corejit = File::Spec->catfile( $jitbase, $cpuarch, q{core.jit} );
- open my $FH, '>', $corejit
- or croak "Unable to open handle to file for testing";
- print $FH qq{Hello, JIT\n};
- close $FH or croak "Unable to close handle to file for testing";
- is( $step->_check_jitcapability($corejit, $cpuarch, $osname, 8), 0,
- "Got expected value for _check_jitcapability(): no JIT on this architecture case");
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'bar';
- my $osname = 'baz';
- my $corejitdir = File::Spec->catdir ( $jitbase, $cpuarch );
- mkpath( $corejitdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- my $corejit = File::Spec->catfile( $jitbase, $cpuarch, q{core.jit} );
- open my $FH, '>', $corejit
- or croak "Unable to open handle to file for testing";
- print $FH qq{Hello, JIT\n};
- close $FH or croak "Unable to close handle to file for testing";
- my $orig = $step->{jit_is_working};
- $step->{jit_is_working} = { $cpuarch => 1 };
- is( $step->_check_jitcapability($corejit, $cpuarch, $osname, 8), 1,
- "Got expected value for _check_jitcapability(): mock JIT case");
- $step->{jit_is_working} = $orig;
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'i386';
- my $osname = 'darwin';
- my $corejitdir = File::Spec->catdir ( $jitbase, $cpuarch );
- mkpath( $corejitdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- my $corejit = File::Spec->catfile( $jitbase, $cpuarch, q{core.jit} );
- open my $FH, '>', $corejit
- or croak "Unable to open handle to file for testing";
- print $FH qq{Hello, JIT\n};
- close $FH or croak "Unable to close handle to file for testing";
- my $orig = $step->{jit_is_working};
- $step->{jit_is_working} = { $cpuarch => 1 };
- is( $step->_check_jitcapability($corejit, $cpuarch, $osname, 8), 0,
- "Got expected value for _check_jitcapability(): mock darwin-i386 case");
- $step->{jit_is_working} = $orig;
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'i386';
- my $osname = 'MSWin32';
- my $corejitdir = File::Spec->catdir ( $jitbase, $cpuarch );
- mkpath( $corejitdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- my $corejit = File::Spec->catfile( $jitbase, $cpuarch, q{core.jit} );
- open my $FH, '>', $corejit
- or croak "Unable to open handle to file for testing";
- print $FH qq{Hello, JIT\n};
- close $FH or croak "Unable to close handle to file for testing";
- my $orig = $step->{jit_is_working};
- $step->{jit_is_working} = { $cpuarch => 1 };
- is( $step->_check_jitcapability($corejit, $cpuarch, $osname, 4), 0,
- "Got expected value for _check_jitcapability(): mock single-float");
- $step->{jit_is_working} = $orig;
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-########### _handle_asm() ###########
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'bar';
- my $jitarchname = "${cpuarch}-baz";
- my $asmdir = File::Spec->catdir( $jitbase, $cpuarch );
- mkpath( $asmdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- mkpath( q{src}, { mode => 0755 } ) or croak "Unable to make testing directory";
-
- ok(auto::jit::_handle_asm( {
- conf => $conf,
- jitbase => $jitbase,
- cpuarch => $cpuarch,
- jitarchname => $jitarchname,
- } ), "_handle_asm() returned successfully");
- is( $conf->data->get( 'asmfun_o' ), q{},
- "Got expected value for asmfun_o: no asm case");
- $conf->data->set( asmfun_o => undef ); # reset for next test
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'bar';
- my $jitarchname = "${cpuarch}-baz";
- my $asmdir = File::Spec->catdir( $jitbase, $cpuarch );
- mkpath( $asmdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- mkpath( q{src}, { mode => 0755 } ) or croak "Unable to make testing directory";
-
- my $sjit =
- File::Spec->catfile( $jitbase, $cpuarch, qq{${jitarchname}.s} );
- open my $FH, '>', $sjit
- or croak "Unable to open handle to file for testing";
- print $FH qq{Hello, JIT\n};
- close $FH or croak "Unable to close handle to file for testing";
-
- ok(auto::jit::_handle_asm( {
- conf => $conf,
- jitbase => $jitbase,
- cpuarch => $cpuarch,
- jitarchname => $jitarchname,
- } ), "_handle_asm() returned successfully");
- is( $conf->data->get( 'asmfun_o' ), q{src/asmfun$(O)},
- "Got expected value for asmfun_o: sjit case");
- $conf->data->set( asmfun_o => undef ); # reset for next test
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'bar';
- my $jitarchname = "${cpuarch}-baz";
- my $asmdir = File::Spec->catdir( $jitbase, $cpuarch );
- mkpath( $asmdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- mkpath( q{src}, { mode => 0755 } ) or croak "Unable to make testing directory";
- my $asm = File::Spec->catfile( $jitbase, $cpuarch, q{asm.s} );
- open my $FH, '>', $asm
- or croak "Unable to open handle to file for testing";
- print $FH qq{Hello, JIT\n};
- close $FH or croak "Unable to close handle to file for testing";
-
- ok(auto::jit::_handle_asm( {
- conf => $conf,
- jitbase => $jitbase,
- cpuarch => $cpuarch,
- jitarchname => $jitarchname,
- } ), "_handle_asm() returned successfully");
- is( $conf->data->get( 'asmfun_o' ), q{src/asmfun$(O)},
- "Got expected value for asmfun_o: asm case");
- $conf->data->set( asmfun_o => undef ); # reset for next test
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-########### _first_probe_for_exec() ###########
-
-is( $step->_first_probe_for_exec( 'i386', 'foobar' ), 0,
- "Got expected value for _first_probe_for_exec");
-is( $step->_first_probe_for_exec( 'i386', 'openbsd' ), 1,
- "Got expected value for _first_probe_for_exec");
-is( $step->_first_probe_for_exec( 'foobar', 'openbsd' ), 0,
- "Got expected value for _first_probe_for_exec");
-
-########### _handle_execcapable() ###########
-
-if (! defined $conf->data->get('cpuarch') ) {
- $conf->data->set('cpuarch' => 1)
-}
-
-ok(auto::jit::_handle_execcapable($conf, 1),
- "_handle_execcapable() returned true value");
-is($conf->data->get('execcapable'), 1,
- "Got expected value for execcapable");
-# prepare for next test
-$conf->data->set('execcapable' => undef);
-
-ok(auto::jit::_handle_execcapable($conf, 0),
- "_handle_execcapable() returned true value");
-is($conf->data->get('execcapable'), 0,
- "Got expected value for execcapable");
-$conf->data->set('execcapable' => undef);
-
-########### _handle_exec_protect() ###########
-
-$conf->data->set( has_exec_protect => undef );
-auto::jit::_handle_exec_protect($conf, 0, 0);
-ok( ! defined $conf->data->get( 'has_exec_protect'),
- "'has_exec_protect' undefined, as expected");
-
-auto::jit::_handle_exec_protect($conf, 1, 0);
-is( $conf->data->get( 'has_exec_protect'), 1,
- "Got expected value for 'has_exec_protect'");
-$conf->data->set( has_exec_protect => undef );
-
-{
- my ($stdout, $stderr);
- capture(
- sub { auto::jit::_handle_exec_protect($conf, 0, 1); },
- \$stdout,
- \$stderr,
- );
- ok( ! defined $conf->data->get( 'has_exec_protect'),
- "'has_exec_protect' undefined, as expected");
- like($stdout, qr/no\)/, "Got expected verbose output");
- $conf->data->set( has_exec_protect => undef );
-}
-
-{
- my ($stdout, $stderr);
- capture(
- sub { auto::jit::_handle_exec_protect($conf, 1, 1); },
- \$stdout,
- \$stderr,
- );
- is( $conf->data->get( 'has_exec_protect'), 1,
- "Got expected value for 'has_exec_protect'");
- like($stdout, qr/yes\)/, "Got expected verbose output");
- $conf->data->set( has_exec_protect => undef );
-}
-
-$conf->replenish($serialized);
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--jitcapable=0}, q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-# Mock some values so that we can get to the point inside runstep() where the
-# command-line option for jitcapable is relevant.
-
-$cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $jitbase = 'foo';
- my $cpuarch = 'i386';
- my $osname = 'darwin';
- my $corejitdir = File::Spec->catdir ( $jitbase, $cpuarch );
- mkpath( $corejitdir, { mode => 0755 } ) or croak "Unable to make testing directory";
- my $corejit = File::Spec->catfile( $jitbase, $cpuarch, q{core.jit} );
- open my $FH, '>', $corejit
- or croak "Unable to open handle to file for testing";
- print $FH qq{Hello, JIT\n};
- close $FH or croak "Unable to close handle to file for testing";
- my $orig = $step->{jit_is_working};
- $step->{jit_is_working} = { $cpuarch => 1 };
- $conf->data->set( cpuarch => $cpuarch );
- $conf->data->set( osname => $osname );
- {
- my ($stdout, $stderr, $ret);
- capture(
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- \$stderr,
- );
- ok( $ret, "runstep() returned true value" );
- like($stdout, qr/yes|no/s, "Got expected verbose output");
- }
- $step->{jit_is_working} = $orig;
- $conf->data->set( cpuarch => undef );
- $conf->data->set( osname => undef );
-
- is( $conf->data->get( 'jitarchname' ), 'nojit',
- "Got expected value for jitarchname");
- is( $conf->data->get( 'jitcapable' ), 0,
- "Got expected value for jitcapable");
- is( $conf->data->get( 'execcapable' ), 0,
- "Got expected value for execcapable");
- is( $conf->data->get( 'cc_hasjit' ), '',
- "Got expected value for cc_hasjit");
- is( $conf->data->get( 'TEMP_jit_o' ), '',
- "Got expected value for TEMP_jit_o");
- is( $conf->data->get( 'TEMP_exec_h' ), '',
- "Got expected value for TEMP_exec_h");
- is( $conf->data->get( 'TEMP_exec_o' ), '',
- "Got expected value for TEMP_exec_o");
- is( $conf->data->get( 'TEMP_exec_dep' ), '',
- "Got expected value for TEMP_exec_dep");
- is( $step->result(), 'no',
- "Got expected result for no JIT");
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_jit-01.t - test auto::jit
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_jit-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::jit.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::jit, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_macports-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_macports-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,226 +0,0 @@
-#! perl
-# Copyright (C) 2007-2009, Parrot Foundation.
-# $Id$
-# auto_macports-01.t
-
-use strict;
-use warnings;
-use Test::More;
-use Carp;
-use Cwd;
-use File::Spec;
-use File::Temp qw( tempdir );
-use lib qw( lib t/configure/testlib );
-
-plan( skip_all => 'Macports is Darwin only' ) unless $^O =~ /darwin/;
-plan( tests => 52 );
-
-use_ok('config::init::defaults');
-use_ok('config::auto::macports');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw( capture );
-
-########## not Darwin ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::macports};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-
-# mock not Darwin
-$conf->data->set_p5( 'OSNAME' => 'foobar' );
-ok($step->runstep($conf), "runstep() returned true value");
-is($step->result(), q{skipped}, "Got expected result for non-Darwin OS");
-
-$conf->replenish($serialized);
-
-########## Darwin but no Macports ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-
-# mock no Macports-default directories
-$step->{ports_root} = File::Spec->catdir( qw( / my ridiculous foobar ) );
-ok($step->runstep($conf), "runstep() returned true value");
-is($step->result(), 'no', "Got expected result");
-
-$conf->replenish($serialized);
-
-########## Darwin with Macports ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-my $cwd = cwd();
-
-my $tdir = tempdir( CLEANUP => 1 );
-$step->{ports_root} = $tdir;
-ok(chdir $tdir, "Able to change to temporary directory");
-ok( (mkdir 'lib'), "Able to make lib directory");
-ok( (mkdir 'include'), "Able to make include directory");
-
-ok($step->runstep($conf), "runstep() returned true value");
-is($step->result(), q{yes}, "Got expected result");
-
-is($conf->data->get('ports_base_dir'), $tdir,
- "ports base directory set as expected");
-is($conf->data->get('ports_lib_dir'), qq{$tdir/lib},
- "ports 'lib' directory set as expected");
-is($conf->data->get('ports_include_dir'), qq{$tdir/include},
- "ports 'include' directory set as expected");
-
-ok(chdir $cwd, "Able to change back to original directory after testing");
-
-$conf->replenish($serialized);
-
-########## not Darwin; --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-# mock not Darwin
-my $osname = 'foobar';
-$conf->data->set_p5( 'OSNAME' => $osname );
-{
- my ($stdout, $stderr);
- my $ret = capture sub { $step->runstep($conf) }, \$stdout, \$stderr;
- ok($ret, "runstep() returned true value");
- is($step->result(), q{skipped}, "Got expected result for non-Darwin OS");
- like(
- $stdout,
- qr/^Operating system is $osname; Macports is Darwin only/,
- "Got expected verbose output"
- );
-}
-
-$conf->replenish($serialized);
-
-########## Darwin; --verbose; no Macports ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-# mock no Macports-default directories
-$step->{ports_root} = File::Spec->catdir( qw( / my ridiculous foobar ) );
-SKIP: {
- skip 'Macports is Darwin only', 3 unless $^O =~ /darwin/;
- my ($stdout, $stderr);
- my $ret = capture sub { $step->runstep($conf) }, \$stdout, \$stderr;
- ok($ret, "runstep() returned true value");
- is($step->result(), 'no', "Got expected result");
- like(
- $stdout,
- qr/^Could not locate Macports directories/,
- "Got expected verbose output"
- );
-}
-$step->{ports_root} = undef; # prepare for next test
-
-$conf->replenish($serialized);
-
-########## Darwin; defective Macports ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-# mock no Macports root directory
-SKIP: {
- skip 'Macports is Darwin only', 2 unless $^O =~ /darwin/;
- $step->{ports_root} = undef;
- ok($step->runstep($conf), "runstep() returned true value");
- is($step->result(), 'no', "Got expected result");
-}
-
-$conf->replenish($serialized);
-
-########## Darwin; --verbose; defective Macports ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-# mock no Macports root directory
-$step->{ports_root} = undef;
-
-my ($stdout, $stderr);
-my $ret = capture sub { $step->runstep($conf) }, \$stdout, \$stderr;
-ok($ret, "runstep() returned true value");
-is($step->result(), 'no', "Got expected result");
-like(
- $stdout,
- qr/^Could not locate Macports root directory/,
- "Got expected verbose output"
-);
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_macports-01.t - test auto::macports
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_macports-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::macports. Some tests run only on Darwin.
-Others simulate what happens on operating systems other than Darwin.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::macports, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
-
Deleted: branches/tt761_keys_revamp/t/steps/auto_macports-02.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_macports-02.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,77 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_macports-02.t
-
-use strict;
-use warnings;
-use Test::More;
-plan( skip_all => 'Macports is Darwin only' ) unless $^O =~ /darwin/;
-plan( tests => 12 );
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-$ENV{TEST_MACPORTS} = 'foobar';
-use_ok('config::auto::macports');
-
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::macports};
-
-$conf->add_steps($pkg);
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-
-# mock no Macports-default directories
-ok($step->runstep($conf), "runstep() returned true value");
-is($step->result(), 'no', "Got expected result");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_macports-02.t - test auto::macports
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_macports-02.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::macports.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::macports, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
-
Deleted: branches/tt761_keys_revamp/t/steps/auto_memalign-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_memalign-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,275 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_memalign-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 69;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::memalign');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########### regular ###########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::memalign};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-$conf->data->set( memalign => 'memalign');
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{already set}, "Expected result was set");
-is($conf->data->get('memalign'),
- q{memalign},
- "memalign set as expected"
-);
-
-$conf->replenish($serialized);
-
-########### _set_malloc_header() ###########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- $conf->data->set('i_malloc' => 1);
- ok(auto::memalign::_set_malloc_header($conf),
- "_set_malloc_header() returned true value");
- is($conf->data->get( 'malloc_header' ), 'malloc.h',
- "malloc_header has expected value");
- $conf->data->set('i_malloc' => undef); # reset for next test
-}
-
-{
- $conf->data->set('i_malloc' => 0);
- ok(auto::memalign::_set_malloc_header($conf),
- "_set_malloc_header() returned true value");
- is($conf->data->get( 'malloc_header' ), 'stdlib.h',
- "malloc_header has expected value");
- $conf->data->set('i_malloc' => undef); # reset for next test
-}
-
-########### _set_ptrcast() ###########
-
-{
- $conf->data->set('ptrsize' => 2);
- $conf->data->set('intsize' => 2);
- ok(auto::memalign::_set_ptrcast($conf),
- "_set_ptrcast() returned true value");
- is($conf->data->get( 'ptrcast' ), 'int',
- "ptrcast has expected value");
- # reset for next test
- $conf->data->set('ptrsize' => undef);
- $conf->data->set('intsize' => undef);
-}
-
-{
- $conf->data->set('ptrsize' => 2);
- $conf->data->set('intsize' => 4);
- ok(auto::memalign::_set_ptrcast($conf),
- "_set_ptrcast() returned true value");
- is($conf->data->get( 'ptrcast' ), 'long',
- "ptrcast has expected value");
- # reset for next test
- $conf->data->set('ptrsize' => undef);
- $conf->data->set('intsize' => undef);
-}
-
-########### _set_memalign() ###########
-
-{
- $conf->data->set( malloc_header => 'malloc.h' );
- ok($step->_set_memalign($conf, 1, 1),
- "_set_memalign() returned true value");
- ok(! defined $conf->data->get( 'malloc_header' ),
- "malloc_header now undef as expected");
- is($conf->data->get( 'memalign' ), 'posix_memalign',
- "Got expected value for memalign");
- is($step->result(), q{yes}, "Got expected result");
-}
-
-{
- $conf->data->set( malloc_header => 'malloc.h' );
- ok($step->_set_memalign($conf, 1, 0),
- "_set_memalign() returned true value");
- ok(! defined $conf->data->get( 'malloc_header' ),
- "malloc_header now undef as expected");
- is($conf->data->get( 'memalign' ), 'memalign',
- "Got expected value for memalign");
- is($step->result(), q{yes}, "Got expected result");
-}
-
-{
- $conf->data->set( malloc_header => 'malloc.h' );
- ok($step->_set_memalign($conf, 0, 1),
- "_set_memalign() returned true value");
- ok(! defined $conf->data->get( 'malloc_header' ),
- "malloc_header now undef as expected");
- is($conf->data->get( 'memalign' ), 'posix_memalign',
- "Got expected value for memalign");
- is($step->result(), q{no}, "Got expected result");
-}
-
-{
- $conf->data->set( malloc_header => 'malloc.h' );
- ok($step->_set_memalign($conf, 0, 0),
- "_set_memalign() returned true value");
- ok(! defined $conf->data->get( 'malloc_header' ),
- "malloc_header now undef as expected");
- is($conf->data->get( 'memalign' ), '',
- "Got expected value (empty string) for memalign");
- is($step->result(), q{no}, "Got expected result");
-}
-
-$conf->replenish($serialized);
-
-########### --verbose; _set_memalign() ###########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--verbose} ],
- mode => q{configure},
- }
-);
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- $conf->data->set( malloc_header => 'malloc.h' );
- my ($rv, $stdout, $expected);
- $expected = 'posix_memalign';
- capture(
- sub { $rv = $step->_set_memalign($conf, 1, 1); },
- \$stdout,
- );
- ok($rv, "_set_memalign() returned true value");
- ok(! defined $conf->data->get( 'malloc_header' ),
- "malloc_header now undef as expected");
- is($conf->data->get( 'memalign' ), $expected,
- "Got expected value for memalign");
- is($step->result(), q{yes}, "Got expected result");
- like($stdout, qr/Yep:$expected/,
- "Got expected verbose output");
-}
-
-{
- $conf->data->set( malloc_header => 'malloc.h' );
- my ($rv, $stdout, $expected);
- $expected = 'memalign';
- capture(
- sub { $rv = $step->_set_memalign($conf, 1, 0); },
- \$stdout,
- );
- ok($rv, "_set_memalign() returned true value");
- ok(! defined $conf->data->get( 'malloc_header' ),
- "malloc_header now undef as expected");
- is($conf->data->get( 'memalign' ), $expected,
- "Got expected value for memalign");
- is($step->result(), q{yes}, "Got expected result");
- like($stdout, qr/Yep:$expected/,
- "Got expected verbose output");
-}
-
-{
- $conf->data->set( malloc_header => 'malloc.h' );
- my ($rv, $stdout, $expected);
- $expected = 'posix_memalign';
- capture(
- sub { $rv = $step->_set_memalign($conf, 0, 1); },
- \$stdout,
- );
- ok($rv, "_set_memalign() returned true value");
- ok(! defined $conf->data->get( 'malloc_header' ),
- "malloc_header now undef as expected");
- is($conf->data->get( 'memalign' ), $expected,
- "Got expected value for memalign");
- is($step->result(), q{no}, "Got expected result");
- like($stdout, qr/no/,
- "Got expected verbose output");
-}
-
-{
- $conf->data->set( malloc_header => 'malloc.h' );
- my ($rv, $stdout, $expected);
- $expected = '';
- capture(
- sub { $rv = $step->_set_memalign($conf, 0, 0); },
- \$stdout,
- );
- ok($rv, "_set_memalign() returned true value");
- ok(! defined $conf->data->get( 'malloc_header' ),
- "malloc_header now undef as expected");
- is($conf->data->get( 'memalign' ), $expected,
- "Got expected value (empty string) for memalign");
- is($step->result(), q{no}, "Got expected result");
- like($stdout, qr/no/,
- "Got expected verbose output");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_memalign-01.t - test auto::memalign
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_memalign-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test subroutines exported by
-config::auto::memalign.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::memalign, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_msvc-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_msvc-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,202 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_msvc-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 43;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::msvc');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########## Win32 ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::msvc};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-SKIP: {
- skip 'MSVC is Windows only', 1 unless $^O =~ /Win32/i;
- ok($step->runstep($conf), "runstep() returned true value");
-}
-
-$conf->replenish($serialized);
-
-########## _evaluate_msvc() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-my $msvcref = { _MSC_VER => 1399 };
-ok($step->_evaluate_msvc($conf, $msvcref),
- "_evaluate_msvc returned true value");
-is($step->result, 'yes, 13.99', "Got expected result");
-is($conf->data->get('msvcversion'), '13.99',
- "Got expected msvc version string");
-
-$conf->replenish($serialized);
-
-########## _evaluate_msvc() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-$msvcref = { _MSC_VER => 1400 };
-ok($step->_evaluate_msvc($conf, $msvcref),
- "_evaluate_msvc returned true value");
-is($step->result, 'yes, 14.0', "Got expected result");
-is($conf->data->get('msvcversion'), '14.0',
- "Got expected msvc version string");
-like(
- $conf->data->get('ccflags'),
- qr/\-D_CRT_SECURE_NO_DEPRECATE/,
- "ccflags appropriately adjusted given MSVC version"
-);
-
-$conf->replenish($serialized);
-
-########## _handle_not_msvc() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-
-my ($status, $major, $minor, $verbose);
-
-$major = 13;
-$minor = 99;
-$verbose = undef;
-$status = $step->_handle_not_msvc($conf, $major, $minor, $verbose);
-ok(! defined $status, 'sub return value, as expected, not yet set');
-ok(! $step->result(), 'result, as expected, not yet set');
-
-$major = 13;
-$minor = undef;
-$verbose = undef;
-$status = $step->_handle_not_msvc($conf, $major, $minor, $verbose);
-ok($status, 'sub return value, as expected, set to true value');
-is($step->result(), q{no}, 'Got expected result');
-ok(! defined ($conf->data->get( 'msvcversion' )),
- 'msvcversion is undef, as expected');
-
-$major = undef;
-$minor = 99;
-$verbose = undef;
-$status = $step->_handle_not_msvc($conf, $major, $minor, $verbose);
-ok($status, 'sub return value, as expected, set to true value');
-is($step->result(), q{no}, 'Got expected result');
-ok(! defined ($conf->data->get( 'msvcversion' )),
- 'msvcversion is undef, as expected');
-
-{
- my $stdout;
- $major = undef;
- $minor = undef;
- $verbose = 1;
- capture(
- sub { $status =
- $step->_handle_not_msvc($conf, $major, $minor, $verbose); },
- \$stdout,
- );
- ok($status, 'sub return value, as expected, set to true value');
- is($step->result(), q{no}, 'Got expected result');
- ok(! defined ($conf->data->get( 'msvcversion' )),
- 'msvcversion is undef, as expected');
- like($stdout, qr/\(no\)/, "Got expected verbose output");
- # Prepare for the next test.
- $step->set_result(undef);
-}
-
-########## _compose_msvcversion() ##########
-
-my $msvcversion;
-
-$major = 13;
-$minor = 99;
-$verbose = undef;
-$msvcversion = $step->_compose_msvcversion($major, $minor, $verbose);
-is($msvcversion, '13.99', "Got expected MSVC version");
-is($step->result(), 'yes, 13.99', "Got expected result");
-$step->set_result(undef);
-
-{
- my $stdout;
- $major = 13;
- $minor = 99;
- $verbose = 1;
- capture(
- sub { $msvcversion =
- $step->_compose_msvcversion($major, $minor, $verbose); },
- \$stdout,
- );
- is($msvcversion, '13.99', "Got expected MSVC version");
- is($step->result(), 'yes, 13.99', "Got expected result");
- $step->set_result(undef);
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_msvc-01.t - test auto::msvc
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_msvc-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::msvc. Some tests run only if the system is
-Win32.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::msvc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_neg_0-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_neg_0-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,165 +0,0 @@
-#! perl
-# Copyright (C) 2009, Parrot Foundation.
-# $Id$
-# auto_neg_0-01.t
-
-use strict;
-use warnings;
-
-use Test::More tests => 31;
-use Carp;
-
-use lib qw( lib t/configure/testlib );
-
-use_ok('config::init::defaults');
-use_ok('config::auto::neg_0');
-
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput 'capture';
-
-########### regular ###########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => 'configure',
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, 'init::defaults', $args );
-my $pkg = 'auto::neg_0';
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, 'runstep() returned true value' );
-ok( defined $step->result(), 'A result has been defined');
-
-$conf->replenish($serialized);
-
-##### _evaluate_cc_run() #####
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => 'configure',
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my $d_neg_0;
-my $orig_has_neg_0 = 0;
-my $verbose = $conf->data->get('verbose');
-
-$d_neg_0 = '-0';
-
-is( $step->_evaluate_cc_run($conf, $d_neg_0, $orig_has_neg_0, $verbose),
- 1,
- '_evaluate_cc_run() completed satisfactorily' );
-
-is( $step->result(), 'yes', 'Got expected result');
-
-$d_neg_0 = '0';
-
-is( $step->_evaluate_cc_run($conf, $d_neg_0, $orig_has_neg_0, $verbose),
- 0,
- '_evaluate_cc_run() completed satisfactorily' );
-is( $step->result(), 'no', 'Got expected result' );
-
-$conf->replenish($serialized);
-
-########## --verbose; _evaluate_cc_run() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$verbose = $conf->options->get('verbose');
-my $has_neg_0;
-
-$d_neg_0 = '-0';
-{
- my ($stdout, $stderr);
- capture(
- sub {
- $has_neg_0 = $step->_evaluate_cc_run(
- $conf, $d_neg_0, $orig_has_neg_0, $verbose
- ),
- },
- \$stdout,
- );
- is( $has_neg_0, 1,
- 'Got expected return value from _evaluate_cc_run()' );
- is( $step->result(), 'yes', 'Got expected result: yes' );
- like( $stdout, qr/\(yes\)/, 'Got expected verbose output' );
-}
-
-$d_neg_0 = '0';
-{
- my ($stdout, $stderr);
- capture(
- sub {
- $has_neg_0 = $step->_evaluate_cc_run(
- $conf, $d_neg_0, $orig_has_neg_0, $verbose
- ),
- },
- \$stdout,
- );
- is( $has_neg_0, 0,
- 'Got expected return value from _evaluate_cc_run()' );
- is( $step->result(), 'no', 'Got expected result: no' );
- like( $stdout, qr/\(no\)/, 'Got expected verbose output' );
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_neg_0-01.t - test auto::neg_0
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_neg_0-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::neg_0.
-
-=head1 AUTHOR
-
-Reini Urban
-
-=head1 SEE ALSO
-
-config::auto::neg_0, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_opengl-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_opengl-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,238 +0,0 @@
-#! perl
-# Copyright (C) 2007-2008, Parrot Foundation.
-# $Id$
-# auto_opengl-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 43;
-use Carp;
-use lib qw( lib );
-use_ok('config::init::defaults');
-use_ok('config::auto::opengl');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########## --without-opengl ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--without-opengl} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::opengl};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-ok( $step->runstep($conf), "runstep() returned true value");
-is( $step->result(), 'no', "Got expected result" );
-is( $conf->data->get( 'has_opengl' ), 0,
- "Got expected value for 'has_opengl'");
-
-$conf->replenish($serialized);
-
-########## _select_lib() ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-# Mock OS/C-compiler combinations
-my ($osname, $cc, $initial_libs);
-$initial_libs = $conf->data->get('libs');
-$osname = 'mswin32';
-$cc = 'gcc';
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_gcc => '-lglut32 -lglu32 -lopengl32',
- win32_nongcc => 'glut.lib glu.lib gl.lib',
- darwin => '-framework OpenGL -framework GLUT',
- default => '-lglut -lGLU -lGL',
-} ),
- '-lglut32 -lglu32 -lopengl32',
- "_select_lib() returned expected value");
-
-$osname = 'mswin32';
-$cc = 'cc';
-$initial_libs = $conf->data->get('libs');
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_gcc => '-lglut32 -lglu32 -lopengl32',
- win32_nongcc => 'glut.lib glu.lib gl.lib',
- darwin => '-framework OpenGL -framework GLUT',
- default => '-lglut -lGLU -lGL',
-} ),
- 'glut.lib glu.lib gl.lib',
- "_select_lib() returned expected value");
-
-$osname = 'darwin';
-$cc = 'cc';
-$initial_libs = $conf->data->get('libs');
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_gcc => '-lglut32 -lglu32 -lopengl32',
- win32_nongcc => 'glut.lib glu.lib gl.lib',
- darwin => '-framework OpenGL -framework GLUT',
- default => '-lglut -lGLU -lGL',
-} ),
- '-framework OpenGL -framework GLUT',
- "_select_lib() returned expected value");
-
-$osname = 'foobar';
-$cc = 'cc';
-$initial_libs = $conf->data->get('libs');
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_gcc => '-lglut32 -lglu32 -lopengl32',
- win32_nongcc => 'glut.lib glu.lib gl.lib',
- darwin => '-framework OpenGL -framework GLUT',
- default => '-lglut -lGLU -lGL',
-} ),
- '-lglut -lGLU -lGL',
- "_select_lib() returned expected value");
-
-$conf->replenish($serialized);
-
-########## --verbose; _evaluate_cc_run() ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--verbose} ],
- mode => q{configure},
- }
-);
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my @try = qw( 4 freeglut );
-my $test = qq{$try[0] $try[1]\n};
-
-{
- my ($stdout, $stderr);
- my ($glut_api_version, $glut_brand);
- capture(
- sub { ($glut_api_version, $glut_brand) = $step->_evaluate_cc_run(
- $test,
- 0,
- ); },
- \$stdout,
- \$stderr,
- );
- is( $glut_api_version, $try[0],
- "Got first expected return value for _evaluate_cc_run()." );
- is( $glut_brand, $try[1],
- "Got first expected return value for _evaluate_cc_run()." );
- ok(! $stdout, "Nothing captured on STDOUT, as expected");
-}
-
-{
- my ($stdout, $stderr);
- my ($glut_api_version, $glut_brand);
- capture(
- sub { ($glut_api_version, $glut_brand) = $step->_evaluate_cc_run(
- $test,
- $conf->options->get( 'verbose' )
- ); },
- \$stdout,
- \$stderr,
- );
- is( $glut_api_version, $try[0],
- "Got first expected return value for _evaluate_cc_run()." );
- is( $glut_brand, $try[1],
- "Got first expected return value for _evaluate_cc_run()." );
- like(
- $stdout,
- qr/yes, $glut_brand API version $glut_api_version/,
- "Got expected verbose output for _evaluate_cc_run()"
- );
-}
-
-########## _handle_glut() ##########
-
-{
- my $glut_api_version = '4';
- my $glut_brand = 'freeglut';
- ok(auto::opengl::_handle_glut( $conf, 'lib', $glut_api_version, $glut_brand ),
- "_handle_glut() returned true value");
- is( $conf->data->get( 'opengl' ), 'define',
- "Got expected value for opengl");
- is( $conf->data->get( 'has_opengl' ), 1,
- "Got expected value for has_opengl");
- is( $conf->data->get( 'HAS_OPENGL' ), 1,
- "Got expected value for HAS_OPENGL");
- is( $conf->data->get( 'glut' ), 'define',
- "Got expected value for glut");
- is( $conf->data->get( 'glut_brand' ), $glut_brand,
- "Got expected value for glut_brand");
- is( $conf->data->get( 'has_glut' ), $glut_api_version,
- "Got expected value for has_glut");
- is( $conf->data->get( 'HAS_GLUT' ), $glut_api_version,
- "Got expected value for HAS_GLUT");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
- auto_opengl-01.t - test auto::opengl
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_opengl-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test configuration step class auto::opengl.
-
-=head1 AUTHOR
-
-Geoffrey Broadwell; modified from a similar file by James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::opengl, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_ops-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_ops-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,77 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_ops-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 6;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::ops');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## ops ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ops=alpha} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::ops};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-$conf->options->set('ops' => 'alpha');
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_ops-01.t - test auto::ops
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_ops-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::ops.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::ops, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_pcre-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_pcre-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,180 +0,0 @@
-#! perl
-# Copyright (C) 2007-2008, Parrot Foundation.
-# $Id$
-# auto_pcre-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 34;
-use Carp;
-use lib qw( lib );
-use_ok('config::init::defaults');
-use_ok('config::auto::pcre');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########## --without-pcre ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--without-pcre} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::pcre};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-ok( $step->runstep($conf), "runstep() returned true value");
-is( $step->result(), 'no', "Got expected result" );
-is( $conf->data->get( 'HAS_PCRE' ), 0,
- "Got expected value for 'HAS_PCRE'");
-
-$conf->replenish($serialized);
-
-########## _select_lib() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-# Mock values for OS and C-compiler
-my ($osname, $cc, $initial_value);
-
-$osname = 'mswin32';
-$cc = 'gcc';
-$initial_value = $conf->data->get( 'libs' );
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'pcre.lib',
- default => '-lpcre',
-} ),
- '-lpcre',
- "_select_lib() returned expected value");
-
-$osname = 'mswin32';
-$cc = 'cc';
-$initial_value = $conf->data->get( 'libs' );
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'pcre.lib',
- default => '-lpcre',
-} ),
- 'pcre.lib',
- "_select_lib() returned expected value");
-
-$osname = 'foobar';
-$cc = 'gcc';
-$initial_value = $conf->data->get( 'libs' );
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'pcre.lib',
- default => '-lpcre',
-} ),
- '-lpcre',
- "_select_lib() returned expected value");
-
-########## _evaluate_cc_run() ##########
-
-# Mock different outcomes of _evaluate_cc_run
-my ($test, $has_pcre);
-my $verbose = $conf->options->get('verbose');
-
-$test = q{pcre foobar};
-ok(! $step->_evaluate_cc_run($test, $verbose),
- "Got expected setting for HAS_PCRE");
-
-$test = q{pcre 4.1};
-ok($step->_evaluate_cc_run($test, $verbose),
- "_evaluate_cc_run returned true value as expected");
-is($step->result(), q{yes, 4.1}, "Got expected PCRE version");
-
-$conf->replenish($serialized);
-
-########## --verbose; _evaluate_cc_run() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-# Mock different outcomes of _evaluate_cc_run
-$verbose = $conf->options->get('verbose');
-
-$test = q{pcre 4.0};
-{
- my ($stdout, $stderr);
- capture(
- sub {
- $has_pcre = $step->_evaluate_cc_run($test, $verbose);
- },
- \$stdout,
- );
- ok($has_pcre, "_evaluate_cc_run returned true value as expected");
- is($step->result(), q{yes, 4.0}, "Got expected PCRE version");
- like($stdout, qr/\(yes, 4\.0\)/, "Got expected verbose output");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
- auto_pcre-01.t - test auto::pcre
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_pcre-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test configuration step class auto::pcre.
-
-=head1 AUTHOR
-
-Alberto SimÃes.
-
-=head1 SEE ALSO
-
-config::auto::pcre, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_perldoc-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_perldoc-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,140 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_perldoc-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 32;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::perldoc');
-use Parrot::BuildUtil;
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::perldoc};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-ok($step->runstep($conf), "runstep() completed successfully");
-ok(defined($step->result), "Result was defined");
-my $has = $conf->data->get('has_perldoc');
-ok( ( ($has == 1) or ($has == 0) ),
- "Got an acceptable value for 'has_perldoc'");
-my $new = $conf->data->get('new_perldoc');
-ok( ( ($new == 1) or ($new == 0) ),
- "Got an acceptable value for 'new_perldoc'");
-
-$conf->replenish($serialized);
-
-########## _initial_content_check() ##########
-
-my $content = undef;
-my $rv = $step->_initial_content_check($conf, $content);
-ok(! defined $rv, "Got expected return value when content was undefined");
-is($step->result(),
- q{no}, "Got expected result when content was undefined");
-
-########## _handle_version() ##########
-
-my $version;
-$version = 0;
-ok(auto::perldoc::_handle_version($conf, $version, 'not_a_path'),
- "_handle_version() returned true value");
-is($conf->data->get('has_perldoc'), 0,
- "Got expected value for 'has_perldoc'");
-is($conf->data->get('new_perldoc'), 0,
- "Got expected value for 'new_perldoc'");
-is($conf->data->get('perldoc'), 'echo',
- "... and expected 'perldoc' path");
-
-$version = 1;
-ok(auto::perldoc::_handle_version($conf, $version, 'path_to_pd'),
- "_handle_version() returned true value");
-is($conf->data->get('has_perldoc'), 1,
- "Got expected value for 'has_perldoc'");
-is($conf->data->get('new_perldoc'), 0,
- "Got expected value for 'new_perldoc'");
-is($conf->data->get('perldoc'), 'path_to_pd',
- "... and expected 'perldoc' path");
-
-$version = 2;
-ok(auto::perldoc::_handle_version($conf, $version, 'another_path_to_pd'),
- "_handle_version() returned true value");
-is($conf->data->get('has_perldoc'), 1,
- "Got expected value for 'has_perldoc'");
-is($conf->data->get('new_perldoc'), 1,
- "Got expected value for 'new_perldoc'");
-is($conf->data->get('perldoc'), 'another_path_to_pd',
- "... and expected 'perldoc' path");
-
-########## _handle_old_perldoc() ##########
-
-$version = $step->_handle_old_perldoc();
-is($version, 1, "Got expected version setting for old perldoc");
-is($step->result(), q{yes, old version},
- "Got expected result when old perldoc");
-
-########## _handle_no_perldoc() ##########
-
-$version = $step->_handle_no_perldoc();
-is($version, 0, "Got expected version setting for no perldoc");
-is($step->result(), q{failed}, "Got expected result when no perldoc");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_perldoc-01.t - test auto::perldoc
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_perldoc-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::perldoc.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::perldoc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_pmc-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_pmc-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,177 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_pmc-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 28;
-use Carp;
-use Cwd;
-use File::Path qw| mkpath |;
-use File::Temp qw| tempdir |;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::pmc');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::pmc};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-
-$conf->replenish($serialized);
-
-########## contains_pccmethod() ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- ok( chdir $tdir, 'changed to temp directory for testing' );
-
- my $pmc_with_PCCMETHOD = q{yes.pmc};
- open my $IN1, ">", $pmc_with_PCCMETHOD
- or croak "Unable to open file for writing: $!";
- print $IN1 "PCCMETHOD\n";
- close $IN1 or croak "Unable to close file after writing: $!";
- ok(auto::pmc::contains_pccmethod($pmc_with_PCCMETHOD),
- "Internal subroutine contains_pccmethod returns true as expected");
-
- my $pmc_sans_PCCMETHOD = q{no.pmc};
- open my $IN2, ">", $pmc_sans_PCCMETHOD
- or croak "Unable to open file for writing: $!";
- print $IN2 "Hello world\n";
- close $IN2 or croak "Unable to close file after writing: $!";
- ok( ! defined (
- auto::pmc::contains_pccmethod($pmc_sans_PCCMETHOD)
- ), "Internal subroutine contains_pccmethod returns true as expected"
- );
-
- my $file = 'foobar';
- eval { auto::pmc::contains_pccmethod($file); };
- like($@, qr/Can't read '$file'/, "Got expected 'die' message"); #'
-
- ok( chdir $cwd, 'changed back to original directory after testing' );
-}
-
-########## get_pmc_order() ##########
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- ok( chdir $tdir, 'changed to temp directory for testing' );
-
- my $pmcdir = qq{$tdir/src/pmc};
- ok(mkpath($pmcdir, { mode => 0755 }), "Able to make directory for testing");
- my $num = qq{$pmcdir/pmc.num};
- open my $IN3, ">", $num or croak "Unable to open file for writing: $!";
- print $IN3 "# comment line\n";
- print $IN3 "\n";
- print $IN3 "default.pmc\t0\n";
- print $IN3 "null.pmc 1\n";
- print $IN3 "env.pmc 2\n";
- print $IN3 "notapmc 3\n";
- close $IN3 or croak "Unable to close file after writing: $!";
- my $order_ref = auto::pmc::get_pmc_order();
- is_deeply(
- $order_ref,
- {
- 'default.pmc' => 0,
- 'null.pmc' => 1,
- 'env.pmc' => 2,
- },
- "Able to read src/pmc/pmc.num correctly"
- );
-
- my @pmcs = qw| env.pmc default.pmc null.pmc other.pmc |;
- my @sorted_pmcs = auto::pmc::sort_pmcs(@pmcs);
- is_deeply(
- \@sorted_pmcs,
- [ qw| default.pmc null.pmc env.pmc other.pmc | ],
- "PMCs sorted correctly"
- );
-
- ok( chdir $cwd, 'changed back to original directory after testing' );
-}
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- ok( chdir $tdir, 'changed to temp directory for testing' );
-
- my $pmcdir = qq{$tdir/src/pmc};
- ok(mkpath($pmcdir, { mode => 0755 }), "Able to make directory for testing");
- eval { my $order_ref = auto::pmc::get_pmc_order(); };
- like($@,
- qr/Can't read src\/pmc\/pmc\.num/, "Got expected 'die' message");
-#'
-
- ok( chdir $cwd, 'changed back to original directory after testing' );
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_pmc-01.t - test auto::pmc
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_pmc-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::pmc.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::pmc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_pod2man-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_pod2man-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,87 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_pod2man-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 15;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::pod2man');
-use Parrot::BuildUtil;
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-
-my $pkg = q{auto::pod2man};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-ok($step->runstep($conf), "runstep() completed successfully");
-ok(defined($step->result), "Result was defined");
-my $has = $conf->data->get('has_pod2man');
-ok( ( ($has == 1) or ($has == 0) ),
- "Got an acceptable value for 'has_pod2man'");
-
-$conf->replenish($serialized);
-
-########## _initial_content_check() ##########
-
-my $content = undef;
-my $rv = $step->_initial_content_check($conf, $content);
-ok(! defined $rv, "Got expected return value when content was undefined");
-is($step->result(),
- q{no}, "Got expected result when content was undefined");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_pod2man-01.t - test auto::pod2man
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_pod2man-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::pod2man.
-
-=head1 SEE ALSO
-
-config::auto::pod2man, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_readline-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_readline-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,343 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_readline-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 69;
-use Carp;
-use Cwd;
-use File::Spec;
-use File::Temp qw( tempdir );
-use lib qw( lib );
-use_ok('config::init::defaults');
-use_ok('config::auto::readline');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw | capture |;
-
-########## _select_lib() ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::readline};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-# Mock values for OS and C-compiler
-my ($osname, $cc);
-$osname = 'mswin32';
-$cc = 'gcc';
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'readline.lib',
- default => '-lreadline',
-} ),
- '-lreadline',
- "_select_lib() returned expected value");
-
-$osname = 'mswin32';
-$cc = 'cc';
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'readline.lib',
- default => '-lreadline',
-} ),
- 'readline.lib',
- "_select_lib() returned expected value");
-
-$osname = 'foobar';
-$cc = undef;
-is($step->_select_lib( {
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'readline.lib',
- default => '-lreadline',
-} ),
- '-lreadline',
- "_select_lib() returned true value");
-
-$osname = 'foobar';
-$cc = undef;
-eval {
- $step->_select_lib( [
- conf => $conf,
- osname => $osname,
- cc => $cc,
- win32_nongcc => 'readline.lib',
- default => '-lreadline',
- ] );
-};
-like($@, qr/_select_lib\(\) takes hashref/,
- "Bad argument to _select_lib correctly detected");
-
-########## _handle_darwin_for_fink() ##########
-
-my ($flagsbefore, $flagsafter);
-
-$osname = 'foobar';
-$flagsbefore = $conf->data->get( 'linkflags' );
-ok($step->_handle_darwin_for_fink($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_fink() returned true value");
-$flagsafter = $conf->data->get( 'linkflags' );
-is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-
-my $cwd = cwd();
-{
- my $tdir1 = tempdir( CLEANUP => 1 );
- ok(chdir $tdir1, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $tdir1, 'lib' );
- my $includedir = File::Spec->catdir( $tdir1, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => $includedir);
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter,
- "No change in linkflags, as expected, where Fink lib and include directories exist but readline/readline.h does not");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-{
- my $tdir2 = tempdir( CLEANUP => 1 );
- ok(chdir $tdir2, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- ok( (mkdir 'include/readline'), "Able to make include/readline directory");
- my $libdir = File::Spec->catdir( $tdir2, 'lib' );
- my $includedir = File::Spec->catdir( $tdir2, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => $includedir);
- my $foo = File::Spec->catfile( $includedir, 'readline', 'readline.h' );
- open my $FH, ">", $foo or croak "Could not open for writing";
- print $FH "Hello world\n";
- close $FH or croak "Could not close after writing";
-
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- isnt($flagsbefore, $flagsafter, "Change in linkflags, as expected");
- like($conf->data->get( 'linkflags' ), qr/-L\Q$libdir\E/,
- "'linkflags' modified as expected, in case where Fink lib and include dirs exist and readline/readline.h exists");
- $conf->data->set( linkflags => $flagsbefore ); #reset for next test
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-{
- my $tdir3 = tempdir( CLEANUP => 1 );
- ok(chdir $tdir3, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- ok( (mkdir 'include/readline'), "Able to make include/readline directory");
- my $libdir = File::Spec->catdir( $tdir3, 'lib' );
- my $includedir = File::Spec->catdir( $tdir3, 'include' );
- $conf->data->set('fink_lib_dir' => $libdir);
- $conf->data->set('fink_include_dir' => undef);
-
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter,
- "No change in linkflags, as expected, where Fink include directory does not exist");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-{
- my $tdir4 = tempdir( CLEANUP => 1 );
- ok(chdir $tdir4, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- ok( (mkdir 'include/readline'), "Able to make include/readline directory");
- my $libdir = File::Spec->catdir( $tdir4, 'lib' );
- my $includedir = File::Spec->catdir( $tdir4, 'include' );
- $conf->data->set('fink_lib_dir' => undef );
- $conf->data->set('fink_include_dir' => $includedir );
-
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_fink($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_fink() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter,
- "No change in linkflags, as expected, where Fink lib directory does not exist");
-
- ok(chdir $cwd, "Able to change back to original directory after testing");
-}
-
-########## _handle_darwin_for_macports() ##########
-
-$osname = 'foobar';
-$flagsbefore = $conf->data->get( 'linkflags' );
-ok($step->_handle_darwin_for_macports($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_macports() returned true value");
-$flagsafter = $conf->data->get( 'linkflags' );
-is($flagsbefore, $flagsafter, "No change in linkflags, as expected");
-# Get ready for the next test
-$conf->data->set( linkflags => $flagsbefore );
-
-$cwd = cwd();
-{
- my $xtdir1 = File::Spec->canonpath( tempdir( CLEANUP => 1 ) );
- ok(chdir $xtdir1, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $xtdir1, 'lib' );
- my $includedir = File::Spec->catdir( $xtdir1, 'include' );
- $conf->data->set( ports_base_dir => $xtdir1 );
- $conf->data->set( ports_lib_dir => $libdir );
- $conf->data->set( ports_include_dir => $includedir );
- ok( (mkdir 'include/readline'), "Able to make include/readline directory");
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_macports($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_macports() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter,
- "No change in linkflags, as expected, where macports lib and include directories exist but readline/readline.h does not");
-
- chdir $cwd or croak "Unable to change back to original directory";
-}
-
-$cwd = cwd();
-{
- my $xtdir2 = File::Spec->canonpath( tempdir( CLEANUP => 1 ) );
- ok(chdir $xtdir2, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $xtdir2, 'lib' );
- my $includedir = File::Spec->catdir( $xtdir2, 'include' );
- $conf->data->set( ports_base_dir => $xtdir2 );
- $conf->data->set( ports_lib_dir => $libdir );
- $conf->data->set( ports_include_dir => $includedir );
- ok( (mkdir 'include/readline'), "Able to make include/readline directory");
- my $foo = File::Spec->catfile( $includedir, 'readline', 'readline.h' );
- open my $FH, ">", $foo or croak "Could not open for writing";
- print $FH "Hello world\n";
- close $FH or croak "Could not close after writing";
-
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_macports($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_macports() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- isnt($flagsbefore, $flagsafter, "Change in linkflags, as expected");
- like($conf->data->get( 'linkflags' ), qr/-L\Q$libdir\E/,
- "'linkflags' modified as expected, in case where macports lib and include dirs exist and readline/readline.h exists");
- $conf->data->set( linkflags => $flagsbefore );
-
- chdir $cwd or croak "Unable to change back to original directory";
-}
-
-
-$cwd = cwd();
-{
- my $xtdir3 = File::Spec->canonpath( tempdir( CLEANUP => 1 ) );
- ok(chdir $xtdir3, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $xtdir3, 'lib' );
- my $includedir = File::Spec->catdir( $xtdir3, 'include' );
- $conf->data->set( ports_base_dir => $xtdir3 );
- $conf->data->set( ports_lib_dir => $libdir );
- $conf->data->set( ports_include_dir => undef );
-
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_macports($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_macports() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter,
- "No change in linkflags, as expected, where Macports include directory does not exist");
-
- chdir $cwd or croak "Unable to change back to original directory";
-}
-
-$cwd = cwd();
-{
- my $xtdir4 = File::Spec->canonpath( tempdir( CLEANUP => 1 ) );
- ok(chdir $xtdir4, "Able to change to temporary directory");
- ok( (mkdir 'lib'), "Able to make lib directory");
- ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = File::Spec->catdir( $xtdir4, 'lib' );
- my $includedir = File::Spec->catdir( $xtdir4, 'include' );
- $conf->data->set( ports_base_dir => $xtdir4 );
- $conf->data->set( ports_lib_dir => undef );
- $conf->data->set( ports_include_dir => $includedir );
-
- $osname = 'darwin';
- $flagsbefore = $conf->data->get( 'linkflags' );
- ok($step->_handle_darwin_for_macports($conf, $osname, 'readline/readline.h'),
- "handle_darwin_for_macports() returned true value");
- $flagsafter = $conf->data->get( 'linkflags' );
- is($flagsbefore, $flagsafter,
- "No change in linkflags, as expected, where Macports lib directory does not exist");
-
- chdir $cwd or croak "Unable to change back to original directory";
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_readline-01.t - test auto::readline
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_readline-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::readline.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::readline, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_readline-02.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_readline-02.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,114 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_readline-02.t
-
-use strict;
-use warnings;
-use Test::More tests => 14;
-use Carp;
-use Cwd;
-use lib qw( lib );
-use_ok('config::auto::readline');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::readline};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-########## _evaluate_cc_run() ##########
-
-my ($has_readline, $verbose);
-
-$verbose = undef;
-$has_readline = $step->_evaluate_cc_run($verbose);
-is($has_readline, 1, "Got expected value for has_readline");
-is($step->result(), 'yes', "Expected result was set");
-# Prepare for next test
-$step->set_result(undef);
-
-{
- my $stdout;
- $verbose = 1;
- capture(
- sub { $has_readline = $step->_evaluate_cc_run($verbose); },
- \$stdout,
- );
- is($has_readline, 1, "Got expected value for has_readline");
- is($step->result(), 'yes', "Expected result was set");
- like($stdout, qr/\(yes\)/, "Got expected verbose output");
- # Prepare for next test
- $step->set_result(undef);
-}
-
-########## _handle_readline() ##########
-
-$has_readline = 0;
-ok(auto::readline::_handle_readline($conf, 'lib', $has_readline),
- "_handle_readline() returned true value");
-is($conf->data->get('readline'), 'define',
- "Got expected value for 'readline'");
-# Prepare for next test
-$conf->data->set( readline => undef );
-$conf->data->set( HAS_READLINE => undef );
-
-$has_readline = 1;
-ok(auto::readline::_handle_readline($conf, 'lib', $has_readline),
- "_handle_readline() returned true value");
-is($conf->data->get('readline'), 'define',
- "Got expected value for 'readline'");
-# Prepare for next test
-$conf->data->set( readline => undef );
-$conf->data->set( HAS_READLINE => undef );
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_readline-02.t - test auto::readline
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_readline-02.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::readline.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::readline, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_revision-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_revision-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,108 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_revision-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 15;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::revision');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::revision};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my ($testrev, $ret);
-{
- $testrev = 99999;
- local $Parrot::Revision::current = $testrev;
- $ret = $step->runstep($conf);
- ok( $ret, "runstep() returned true value" );
- is($conf->data->get('revision'), $testrev,
- "'revision' element was set correctly");
- is($step->result(), qq{r$testrev}, "Expected result was set");
-}
-
-{
- $testrev = 0;
- local $Parrot::Revision::current = $testrev;
- $ret = $step->runstep($conf);
- ok( $ret, "runstep() returned true value" );
- is($conf->data->get('revision'), $testrev,
- "'revision' element was set correctly");
- is($step->result(), q{done}, "Expected result was set");
-}
-
-{
- $testrev = q{foobar};
- local $Parrot::Revision::current = $testrev;
- eval { $ret = $step->runstep($conf); };
- like($@, qr/Cannot use non-numeric revision number/,
- "Got expected error message");
-}
-
-{
- $testrev = undef;
- local $Parrot::Revision::current = $testrev;
- $ret = $step->runstep($conf);
- ok( $ret, "runstep() returned true value" );
- ok(! defined($conf->data->get('revision')),
- "'revision' element is undefined as expected");
- is($step->result(), q{done}, "Expected result was set");
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_revision-01.t - test auto::revision
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_revision-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::revision.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::revision, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_signal-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_signal-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,169 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_signal-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 35;
-use Carp;
-use Cwd;
-use File::Temp qw(tempdir);
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::signal');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########### _handle__sighandler_t() ###########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [ ],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::signal};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-ok(auto::signal::_handle__sighandler_t($conf),
- "_handle__sighandler_t() returned true value");
-is($conf->data->get( 'has___sighandler_t'), 'define',
- "Got expected value for has__sighandler_t");
-
-########### _handle_sigaction() ###########
-
-ok(auto::signal::_handle_sigaction($conf),
- "_handle_sigaction() returned true value");
-is($conf->data->get( 'has_sigaction'), 'define',
- "Got expected value for has_sigaction");
-
-########### _handle_setitimer() ###########
-
-ok(auto::signal::_handle_setitimer($conf),
- "_handle_setitimer() returned true value");
-is($conf->data->get( 'has_setitimer'), 'define',
- "Got expected value for has_setitimer");
-is($conf->data->get( 'has_sig_atomic_t'), 'define',
- "Got expected value for has_sig_atomic_t");
-
-########### _print_signalpasm() ###########
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1);
- chdir $tdir or croak "Unable to change to $tdir";
- my $signalpasm = q{signal.pasm};
- ok(auto::signal::_print_signalpasm($conf, $signalpasm),
- "_print_signalpasm returned true value");
- ok(-s $signalpasm, "File with nonzero size created");
- unlink $signalpasm or croak "Unable to delete file after testing";
- chdir $cwd or croak "Unable to change back to $cwd";
-}
-
-$conf->replenish($serialized);
-
-########### --verbose; _handle__sighandler_t() ###########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-rerun_defaults_for_testing($conf, $args );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my $verbose = 1;
-{
- my ($rv, $stdout);
- capture(
- sub { $rv = auto::signal::_handle__sighandler_t($conf, $verbose); },
- \$stdout,
- );
- ok($rv, "_handle__sighandler_t() returned true value");
- is($conf->data->get( 'has___sighandler_t'), 'define',
- "Got expected value for has__sighandler_t");
- like($stdout, qr/__sighandler_t/, "Got expected verbose output");
-}
-
-########### --verbose; _handle_sigaction() ###########
-
-{
- my ($rv, $stdout);
- capture(
- sub { $rv = auto::signal::_handle_sigaction($conf, $verbose); },
- \$stdout,
- );
- ok($rv, "_handle_sigaction() returned true value");
- is($conf->data->get( 'has_sigaction'), 'define',
- "Got expected value for has_sigaction");
- like($stdout, qr/sigaction/, "Got expected verbose output");
-}
-
-########### --verbose; _handle_setitimer() ###########
-
-{
- my ($rv, $stdout);
- capture(
- sub { $rv = auto::signal::_handle_setitimer($conf, $verbose); },
- \$stdout,
- );
- ok($rv, "_handle_setitimer() returned true value");
- is($conf->data->get( 'has_setitimer'), 'define',
- "Got expected value for has_setitimer");
- is($conf->data->get( 'has_sig_atomic_t'), 'define',
- "Got expected value for has_sig_atomic_t");
- like($stdout, qr/setitimer/s, "Got expected verbose output");
-}
-
-$conf->cc_clean();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_signal-01.t - test auto::signal
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_signal-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::signal.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::signal, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_sizes-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_sizes-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,399 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_sizes-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 58;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::auto::sizes');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw | capture |;
-
-
-########## _handle_intval_ptrsize_discrepancy() ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{auto::sizes};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-{
- my $stdout;
- my %results = (
- ptrsize => 1,
- intvalsize => 1,
- );
- capture(
- sub { auto::sizes::_handle_intval_ptrsize_discrepancy(\%results); },
- \$stdout,
- );
- ok(! $stdout, "As expected, no warning needed");
-}
-
-{
- my $stdout;
- my %results = (
- ptrsize => 1,
- intvalsize => 2,
- );
- capture(
- sub { auto::sizes::_handle_intval_ptrsize_discrepancy(\%results); },
- \$stdout,
- );
- like($stdout, qr/I see your chosen INTVAL/s,
- "Got expected warning about discrepancy"
- );
-}
-
-########## _set_int2() ##########
-
-{
- my $stdout;
- my %results = ( shortsize => 2 );
- capture(
- sub { auto::sizes::_set_int2($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'int2_t' ), q{short},
- "Got expected value for int2_t");
- ok(! $stdout, "As expected, no warning needed");
-}
-
-{
- my $stdout;
- my %results = ( shortsize => 4 );
- capture(
- sub { auto::sizes::_set_int2($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'int2_t' ), q{int},
- "Got expected value for int2_t");
- like($stdout, qr/conversion ops might fail/s,
- "Got expected warning");
-}
-
-########## _set_int4() ##########
-
-{
- my $stdout;
- my %results = ( shortsize => 4 );
- capture(
- sub { auto::sizes::_set_int4($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'int4_t' ), q{short},
- "Got expected value for int4_t");
- ok(! $stdout, "As expected, no warning needed");
-}
-
-{
- my $stdout;
- my %results = ( intsize => 4 );
- capture(
- sub { auto::sizes::_set_int4($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'int4_t' ), q{int},
- "Got expected value for int4_t");
- ok(! $stdout, "As expected, no warning needed");
-}
-
-{
- my $stdout;
- my %results = ( longsize => 4 );
- capture(
- sub { auto::sizes::_set_int4($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'int4_t' ), q{long},
- "Got expected value for int4_t");
- ok(! $stdout, "As expected, no warning needed");
-}
-
-{
- my $stdout;
- my %results = ( );
- capture(
- sub { auto::sizes::_set_int4($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'int4_t' ), q{int},
- "Got expected value for int4_t");
- like($stdout, qr/conversion ops might fail/s,
- "Got expected warning");
-}
-
-########## _set_float4() ##########
-
-{
- my $stdout;
- my %results = ( floatsize => 4 );
- capture(
- sub { auto::sizes::_set_float4($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'float4_t' ), q{float},
- "Got expected value for float4_t");
- ok(! $stdout, "As expected, no warning needed");
-}
-
-{
- my $stdout;
- my %results = ( floatsize => 8 );
- capture(
- sub { auto::sizes::_set_float4($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'float4_t' ), q{double},
- "Got expected value for float4_t");
- like($stdout, qr/conversion ops might fail/s,
- "Got expected warning");
-}
-
-########## _set_float8() ##########
-
-{
- my $stdout;
- my %results = ( doublesize => 8 );
- capture(
- sub { auto::sizes::_set_float8($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'float8_t' ), q{double},
- "Got expected value for float8_t");
- ok(! $stdout, "As expected, no warning needed");
-}
-
-{
- my $stdout;
- my %results = ( );
- capture(
- sub { auto::sizes::_set_float8($conf, \%results); },
- \$stdout,
- );
- is($conf->data->get( 'float8_t' ), q{double},
- "Got expected value for float8_t");
- like($stdout, qr/conversion ops might fail/s,
- "Got expected warning");
-}
-
-########## _handle_hugeintvalsize() ##########
-
-my (%hugeintval, $intval, $intvalsize);
-
-$conf->data->set( intval => undef );
-$conf->data->set( intvalsize => undef );
-$hugeintval{hugeintvalsize} = undef;
-$intval = q{integer};
-$intvalsize = 4;
-auto::sizes::_handle_hugeintvalsize(
- $conf,
- {
- hugeintval => \%hugeintval,
- intval => $intval,
- intvalsize => $intvalsize,
- },
-);
-is( $conf->data->get( 'hugeintval' ), $intval,
- "Got expected value for hugeintval");
-is( $conf->data->get( 'hugeintvalsize' ), $intvalsize,
- "Got expected value for hugeintvalsize");
-$conf->data->set( hugeintval => undef );
-$conf->data->set( hugeintvalsize => undef );
-
-$conf->data->set( intval => undef );
-$conf->data->set( intvalsize => undef );
-$hugeintval{hugeintvalsize} = 4;
-$intval = q{integer};
-$intvalsize = 4;
-auto::sizes::_handle_hugeintvalsize(
- $conf,
- {
- hugeintval => \%hugeintval,
- intval => $intval,
- intvalsize => $intvalsize,
- },
-);
-is( $conf->data->get( 'hugeintval' ), $intval,
- "Got expected value for hugeintval");
-is( $conf->data->get( 'hugeintvalsize' ), $intvalsize,
- "Got expected value for hugeintvalsize");
-$conf->data->set( hugeintval => undef );
-$conf->data->set( hugeintvalsize => undef );
-
-$conf->data->set( intval => undef );
-$conf->data->set( intvalsize => undef );
-$hugeintval{hugeintvalsize} = 8;
-$intval = q{integer};
-$intvalsize = 4;
-auto::sizes::_handle_hugeintvalsize(
- $conf,
- {
- hugeintval => \%hugeintval,
- intval => $intval,
- intvalsize => $intvalsize,
- },
-);
-ok( ! defined $conf->data->get( 'hugeintval' ),
- "Got expected value for hugeintval");
-ok( ! defined $conf->data->get( 'hugeintvalsize' ),
- "Got expected value for hugeintvalsize");
-$conf->data->set( hugeintval => undef );
-$conf->data->set( hugeintvalsize => undef );
-
-$conf->data->set( intval => undef );
-$conf->data->set( intvalsize => undef );
-
-########## _set_hugefloatval() ##########
-
-my $size = 12;
-auto::sizes::_set_hugefloatval( $conf, $size );
-is( $conf->data->get( 'hugefloatval' ), 'long double',
- "Got expected type for hugefloatval");
-is( $conf->data->get( 'hugefloatvalsize' ), $size,
- "Got expected size for hugefloatvalsize");
-
-auto::sizes::_set_hugefloatval( $conf, 0 );
-is( $conf->data->get( 'hugefloatval' ), 'double',
- "Got expected type for hugefloatval");
-is( $conf->data->get( 'hugefloatvalsize' ), $conf->data->get('doublesize'),
- "Got expected size for hugefloatvalsize");
-
-########## _set_intvalmaxmin() ##########
-
-my @trueintvals = (
- $conf->data->get( 'iv' ),
- $conf->data->get( 'intvalmin' ),
- $conf->data->get( 'intvalmax' ),
-);
-$conf->data->set( iv => 'int' );
-auto::sizes::_set_intvalmaxmin( $conf );
-is( $conf->data->get( 'intvalmin' ), 'INT_MIN',
- "Got expected value for 'intvalmin' when 'iv' is 'int'" );
-is( $conf->data->get( 'intvalmax' ), 'INT_MAX',
- "Got expected value for 'intvalmax' when 'iv' is 'int'" );
-
-$conf->data->set( iv => 'long' );
-auto::sizes::_set_intvalmaxmin( $conf );
-is( $conf->data->get( 'intvalmin' ), 'LONG_MIN',
- "Got expected value for 'intvalmin' when 'iv' is 'long'" );
-is( $conf->data->get( 'intvalmax' ), 'LONG_MAX',
- "Got expected value for 'intvalmax' when 'iv' is 'long'" );
-
-$conf->data->set( iv => 'long int' );
-auto::sizes::_set_intvalmaxmin( $conf );
-is( $conf->data->get( 'intvalmin' ), 'LONG_MIN',
- "Got expected value for 'intvalmin' when 'iv' is 'long int'" );
-is( $conf->data->get( 'intvalmax' ), 'LONG_MAX',
- "Got expected value for 'intvalmax' when 'iv' is 'long int'" );
-
-$conf->data->set( iv => 'long long' );
-auto::sizes::_set_intvalmaxmin( $conf );
-is( $conf->data->get( 'intvalmin' ), 'LLONG_MIN',
- "Got expected value for 'intvalmin' when 'iv' is 'long long'" );
-is( $conf->data->get( 'intvalmax' ), 'LLONG_MAX',
- "Got expected value for 'intvalmax' when 'iv' is 'long long'" );
-
-$conf->data->set( iv => 'long long int' );
-auto::sizes::_set_intvalmaxmin( $conf );
-is( $conf->data->get( 'intvalmin' ), 'LLONG_MIN',
- "Got expected value for 'intvalmin' when 'iv' is 'long long int'" );
-is( $conf->data->get( 'intvalmax' ), 'LLONG_MAX',
- "Got expected value for 'intvalmax' when 'iv' is 'long long int'" );
-
-my $badtype = 'foobar';
-$conf->data->set( iv => $badtype );
-eval { auto::sizes::_set_intvalmaxmin( $conf ); };
-like($@, qr/Configure.pl: Cannot find limits for type '$badtype'/,
- "Got expected 'die' message for unrecognized 'iv'");
-
-# Reset true values prior to subsequent tests.
-$conf->data->set( 'iv' => $trueintvals[0] );
-$conf->data->set( 'intvalmin' => $trueintvals[1] );
-$conf->data->set( 'intvalmax' => $trueintvals[2] );
-
-########## _set_floatvalmaxmin() ##########
-
-my @truefloatvals = (
- $conf->data->get( 'nv' ),
- $conf->data->get( 'floatvalmin' ),
- $conf->data->get( 'floatvalmax' ),
-);
-
-$conf->data->set( nv => 'double' );
-auto::sizes::_set_floatvalmaxmin( $conf );
-is( $conf->data->get( 'floatvalmin' ), 'DBL_MIN',
- "Got expected value for 'floatvalmin' when 'nv' is 'double'" );
-is( $conf->data->get( 'floatvalmax' ), 'DBL_MAX',
- "Got expected value for 'floatvalmax' when 'nv' is 'double'" );
-
-$conf->data->set( nv => 'long double' );
-auto::sizes::_set_floatvalmaxmin( $conf );
-is( $conf->data->get( 'floatvalmin' ), 'LDBL_MIN',
- "Got expected value for 'floatvalmin' when 'nv' is 'long double'" );
-is( $conf->data->get( 'floatvalmax' ), 'LDBL_MAX',
- "Got expected value for 'floatvalmax' when 'nv' is 'long double'" );
-
-$badtype = 'foobar';
-$conf->data->set( nv => $badtype );
-eval { auto::sizes::_set_floatvalmaxmin( $conf ); };
-like($@, qr/Configure.pl: Cannot find limits for type '$badtype'/,
- "Got expected 'die' message for unrecognized 'nv'");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_sizes-01.t - test auto::sizes
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_sizes-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::sizes.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::sizes, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_snprintf-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_snprintf-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,148 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_snprintf-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 33;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::hints');
-use_ok('config::auto::attributes');
-use_ok('config::auto::snprintf');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep($conf, q{init::defaults}, $args);
-test_step_thru_runstep($conf, q{init::hints}, $args);
-test_step_thru_runstep($conf, q{auto::attributes}, $args);
-
-my $pkg = q{auto::snprintf};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set(%{$args});
-my $step = test_step_constructor_and_description($conf);
-
-# The test of runstep() below will need to be TODO-ed until such time as
-# we can test with all the data which the Parrot::Configure object would
-# normally have during regular configuration at the onset of this step.
-# That's because runstep() consists almost solely of calls to C
-# programs. We can't refactor runstep()'s guts out into internal
-# subroutines and test them explicitly as we've been able to do for
-# other configuration steps. We won't lose any coverage by commenting
-# out the TODO block for the time being, as the coverage analysis will,
-# at the very least, pick up runstep() while running the step itself.
-#
-#TODO: {
-# # http://rt.perl.org/rt3/Ticket/Display.html?id=47391
-# local $TODO =
-# q<Reported failing where vendor-supplied Perl 5 Config.pm does not match true state of system available for Parrot configuration>;
-# ok($step->runstep($conf), "runstep() returned true value");
-#} #'
-
-
-$conf->replenish($serialized);
-
-########## _evaluate_snprintf() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-
-my $res;
-$res = q{old snprintf};
-ok($step->_evaluate_snprintf($conf, $res),
- "_evaluate_snprintf returned true value");
-ok($conf->data->get('HAS_OLD_SNPRINTF'),
- "Got expected value");
-
-$res = q{C99 snprintf};
-ok($step->_evaluate_snprintf($conf, $res),
- "_evaluate_snprintf returned true value");
-ok($conf->data->get('HAS_C99_SNPRINTF'),
- "Got expected value");
-ok($conf->data->get('HAS_SNPRINTF'),
- "Got expected value");
-
-$conf->replenish($serialized);
-
-########## --verbose; _evaluate_snprintf() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--verbose} ],
- mode => q{configure},
-} );
-$conf->options->set(%{$args});
-$step = test_step_constructor_and_description($conf);
-
-{
- my $stdout;
- my $res = q{snprintf};
- my $ret = capture(
- sub { $step->_evaluate_snprintf($conf, $res) },
- \$stdout
- );
- ok($ret, "_evaluate_snprintf returned true value");
- ok($conf->data->get('HAS_SNPRINTF'),
- "Got expected value");
-}
-
-$conf->cc_clean();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_snprintf-01.t - test auto::snprintf
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_snprintf-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::snprintf.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::snprintf, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_socklen_t-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_socklen_t-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,106 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_socklen_t-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 16;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::socklen_t');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw| capture |;
-
-########### regular ###########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::socklen_t};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-ok(defined($step->result()), "A result has been defiined");
-
-$conf->replenish($serialized);
-
-##### _evaluate_socklen_t() #####
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my $d_socklen_t;
-
-$d_socklen_t = q{alpha};
-ok($step->_evaluate_socklen_t($conf, $d_socklen_t),
- "_evaluate_socklen_t() completed satisfactorily");
-is($step->result(), q{yes}, "Got expected result");
-is($conf->data->get('has_socklen_t'), 1,
- "has_socklen_t set as expected");
-
-$d_socklen_t = undef;
-ok($step->_evaluate_socklen_t($conf, $d_socklen_t),
- "_evaluate_socklen_t() completed satisfactorily");
-is($step->result(), q{no}, "Got expected result");
-is($conf->data->get('has_socklen_t'), 0,
- "has_socklen_t set as expected");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_socklen_t-01.t - test auto::socklen_t
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_socklen_t-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::socklen_t.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::socklen_t, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_va_ptr-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_va_ptr-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,66 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_va_ptr-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 5;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::auto::va_ptr');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{auto::va_ptr};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_va_ptr-01.t - test auto::va_ptr
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_va_ptr-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test auto::va_ptr.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::va_ptr, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/auto_warnings-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/auto_warnings-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,183 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# auto_warnings-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 56;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::hints');
-use_ok('config::inter::progs');
-use_ok('config::auto::warnings');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw | capture |;
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::hints}, $args );
-test_step_thru_runstep( $conf, q{inter::progs}, $args );
-
-my $pkg = q{auto::warnings};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-SKIP: {
- skip 'Tests not yet passing on Sun/Solaris',
- 39
- if $^O =~ m/sun|solaris/i;
-
-my $step = test_step_constructor_and_description($conf);
-
-my %potential_warnings_seen;
-$conf->options->set(cage => 1);
-$step->_add_cage_warnings($conf);
-%potential_warnings_seen = map { $_, 1 } @{ $step->{potential_warnings} };
-ok($potential_warnings_seen{'-std=c89'}, "Cage warning added");
-
-$conf->replenish($serialized);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->options->set(maintainer => 1);
-$step->_add_maintainer_warnings($conf);
-%potential_warnings_seen = map { $_, 1 } @{ $step->{potential_warnings} };
-ok($potential_warnings_seen{'-Wlarger-than-4096'}, "Maintainer warning added");
-
-$conf->replenish($serialized);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $warning = q{-Wphony_warning};
-auto::warnings::_set_warning($conf, $warning, 1, undef);
-ok(! $conf->data->get($warning),
- "Got expected setting for warning");
-
-$conf->replenish($serialized);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $warning = q{-Wphony_warning};
- my $stdout;
- capture(
- sub { auto::warnings::_set_warning($conf, $warning, 1, 1); },
- \$stdout,
- );
- ok(! $conf->data->get($warning),
- "Got expected setting for warning");
- like($stdout, qr/exit code:\s+1/, "Got expected verbose output");
-}
-
-$conf->replenish($serialized);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $output = q{some string};
-my $tryflags = q{some flag};
-my $rv = auto::warnings::_set_ccflags($conf, $output, $tryflags, undef);
-is($rv, 1, "_set_ccflags() returned 1 as expected");
-is($conf->data->get("ccflags"), $tryflags, "ccflags changed as expected");
-
-$conf->replenish($serialized);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $output = q{some string};
- my $tryflags = q{some flag};
- my ($rv, $stdout);
- capture(
- sub { $rv = auto::warnings::_set_ccflags($conf, $output, $tryflags, 1); },
- \$stdout,
- );
- is($rv, 1, "_set_ccflags() returned 1 as expected");
- is($conf->data->get("ccflags"), $tryflags, "ccflags changed as expected");
- like($stdout, qr/ccflags:\s+$tryflags/, "Got expected verbose output");
-}
-
-$conf->replenish($serialized);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-# Mock case where C compiler is not gcc.
-$conf->data->set( gccversion => undef );
-ok($step->runstep($conf), "runstep() returned true value");
-is($step->result(), q{skipped}, "Got expected result");
-
-$conf->replenish($serialized);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my ($stdout, $rv);
- # Mock case where C compiler is not gcc.
- $conf->data->set( gccversion => undef );
- $conf->options->set( verbose => 1 );
- capture(
- sub { $rv = $step->runstep($conf); },
- \$stdout,
- );
- ok($rv, "runstep() returned true value");
- is($step->result(), q{skipped}, "Got expected result");
- like($stdout,
- qr/Currently we only set warnings/,
- "Got expected verbose output"
- );
-}
-
-} # End SKIP block for Sun/Solaris
-
-$conf->cc_clean();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_warnings-01.t - test auto::warnings
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_warnings-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test aspects of auto::warnings.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::warnings, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/call_list-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_call_list-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_call_list-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/call_list-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2008, Parrot Foundation.
# $Id$
-# gen_call_list-01.t
+# gen/call_list-01.t
use strict;
use warnings;
@@ -42,11 +42,11 @@
=head1 NAME
- gen_call_list-01.t - test gen::call_list
+ gen/call_list-01.t - test gen::call_list
=head1 SYNOPSIS
- % prove t/steps/gen_call_list-01.t
+ % prove t/steps/gen/call_list-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/config_h-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_config_h-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_config_h-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/config_h-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
-# Copyright (C) 2007, Parrot Foundation.
+# Copyright (C) 2007-2009, Parrot Foundation.
# $Id$
-# gen_config_h-01.t
+# gen/config_h-01.t
use strict;
use warnings;
@@ -39,11 +39,10 @@
my $step = test_step_constructor_and_description($conf);
ok(-f $step->{templates}->{config_h}, "Template for config_h located");
ok(-f $step->{templates}->{feature_h}, "Template for feature_h located");
+ok(-f $step->{templates}->{has_header_h}, "Template for has_header_h located");
$conf->replenish($serialized);
-########## --define; _handle_define_option() ##########
-
($args, $step_list_ref) = process_options( {
argv => [ q{--define=inet_aton} ],
mode => q{configure},
@@ -52,32 +51,17 @@
$conf->options->set( %{$args} );
$step = test_step_constructor_and_description($conf);
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $hh = "has_header.h";
- open( my $HH, ">", "$hh.tmp" )
- or die "Can't open has_header.h: $!";
- gen::config_h::_handle_define_option( $conf, $HH );
- close $HH or die "Can't close temp file: $!";
- my $text = _slurp("$hh.tmp");
- like($text, qr/#define PARROT_DEF_INET_ATON 1/s,
- "Got expected define");
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
pass("Completed all tests in $0");
################### DOCUMENTATION ###################
=head1 NAME
-gen_config_h-01.t - test gen::config_h
+gen/config_h-01.t - test gen::config_h
=head1 SYNOPSIS
- % prove t/steps/gen_config_h-01.t
+ % prove t/steps/gen/config_h-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/config_pm-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_config_pm-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_config_pm-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/config_pm-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# gen_config_pm-01.t
+# gen/config_pm-01.t
use strict;
use warnings;
@@ -43,11 +43,11 @@
=head1 NAME
-gen_config_pm-01.t - test gen::config_pm
+gen/config_pm-01.t - test gen::config_pm
=head1 SYNOPSIS
- % prove t/steps/gen_config_pm-01.t
+ % prove t/steps/gen/config_pm-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/core_pmcs-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_core_pmcs-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_core_pmcs-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/core_pmcs-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# gen_core_pmcs-01.t
+# gen/core_pmcs-01.t
use strict;
use warnings;
@@ -44,11 +44,11 @@
=head1 NAME
-gen_core_pmcs-01.t - test gen::core_pmcs
+gen/core_pmcs-01.t - test gen::core_pmcs
=head1 SYNOPSIS
- % prove t/steps/gen_core_pmcs-01.t
+ % prove t/steps/gen/core_pmcs-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/crypto-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_crypto-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_crypto-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/crypto-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2008, Parrot Foundation.
# $Id$
-# gen_crypto-01.t
+# gen/crypto-01.t
use strict;
use warnings;
@@ -54,11 +54,11 @@
=head1 NAME
- gen_crypto-01.t - test gen::crypto
+ gen/crypto-01.t - test gen::crypto
=head1 SYNOPSIS
- % prove t/steps/gen_crypto-01.t
+ % prove t/steps/gen/crypto-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/makefiles-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_makefiles-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_makefiles-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/makefiles-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2009, Parrot Foundation.
# $Id$
-# gen_makefiles-01.t
+# gen/makefiles-01.t
use strict;
use warnings;
@@ -195,11 +195,11 @@
=head1 NAME
-gen_makefiles-01.t - test gen::makefiles
+gen/makefiles-01.t - test gen::makefiles
=head1 SYNOPSIS
- % prove t/steps/gen_makefiles-01.t
+ % prove t/steps/gen/makefiles-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/opengl-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_opengl-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_opengl-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/opengl-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2008, Parrot Foundation.
# $Id$
-# gen_opengl-01.t
+# gen/opengl-01.t
use strict;
use warnings;
@@ -37,11 +37,11 @@
=head1 NAME
- gen_opengl-01.t - test gen::opengl
+ gen/opengl-01.t - test gen::opengl
=head1 SYNOPSIS
- % prove t/steps/gen_opengl-01.t
+ % prove t/steps/gen/opengl-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/parrot_include-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_parrot_include-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_parrot_include-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/parrot_include-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# gen_parrot_include-01.t
+# gen/parrot_include-01.t
use strict;
use warnings;
@@ -43,11 +43,11 @@
=head1 NAME
-gen_parrot_include-01.t - test gen::parrot_include
+gen/parrot_include-01.t - test gen::parrot_include
=head1 SYNOPSIS
- % prove t/steps/gen_parrot_include-01.t
+ % prove t/steps/gen/parrot_include-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/gen/platform-01.t (from r39980, branches/tt761_keys_revamp/t/steps/gen_platform-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_platform-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/gen/platform-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2008, Parrot Foundation.
# $Id$
-# gen_platform-01.t
+# gen/platform-01.t
use strict;
use warnings;
@@ -198,11 +198,11 @@
=head1 NAME
-gen_platform-01.t - test gen::platform
+gen/platform-01.t - test gen::platform
=head1 SYNOPSIS
- % prove t/steps/gen_platform-01.t
+ % prove t/steps/gen/platform-01.t
=head1 DESCRIPTION
Deleted: branches/tt761_keys_revamp/t/steps/gen_call_list-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_call_list-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,72 +0,0 @@
-#! perl
-# Copyright (C) 2007-2008, Parrot Foundation.
-# $Id$
-# gen_call_list-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 6;
-use Carp;
-use lib qw( lib );
-use_ok('config::gen::call_list');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-my $pkg = q{gen::call_list};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $missing_files = 0;
-foreach my $f ( @{ $step->{fragment_files} } ) {
- $missing_files++ unless (-f $f);
-}
-is($missing_files, 0, "No needed source files are missing");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
- gen_call_list-01.t - test gen::call_list
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_call_list-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test gen::call_list.
-
-=head1 AUTHOR
-
-Geoffrey Broadwell; modified from a similar file by James E Keenan.
-
-=head1 SEE ALSO
-
-config::gen::call_list, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/gen_config_h-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_config_h-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,108 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# gen_config_h-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 11;
-use Carp;
-use Cwd;
-use File::Temp qw( tempdir );
-use lib qw( lib );
-use_ok('config::gen::config_h');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use Parrot::Configure::Utils qw( _slurp );
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-my $pkg = q{gen::config_h};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-ok(-f $step->{templates}->{config_h}, "Template for config_h located");
-ok(-f $step->{templates}->{feature_h}, "Template for feature_h located");
-
-$conf->replenish($serialized);
-
-########## --define; _handle_define_option() ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [ q{--define=inet_aton} ],
- mode => q{configure},
-} );
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $hh = "has_header.h";
- open( my $HH, ">", "$hh.tmp" )
- or die "Can't open has_header.h: $!";
- gen::config_h::_handle_define_option( $conf, $HH );
- close $HH or die "Can't close temp file: $!";
- my $text = _slurp("$hh.tmp");
- like($text, qr/#define PARROT_DEF_INET_ATON 1/s,
- "Got expected define");
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-gen_config_h-01.t - test gen::config_h
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_config_h-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test configuration step gen::config_h. Since this step
-is primarily concerned with printing to files based on reading certain source
-files and reading data stored in the Parrot::Configure object over the course
-of configuration, no complete simulation by a test file is feasible. We
-therefore content ourselves with seeing whether the source files needed by the
-step can be located.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::gen::config_h, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/gen_config_pm-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_config_pm-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,73 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# gen_config_pm-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 8;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::gen::config_pm');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-my $pkg = q{gen::config_pm};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-ok(-f $step->{templates}->{myconfig},
- "Able to locate template for myconfig");
-ok(-f $step->{templates}->{Config_pm},
- "Able to locate template for Config_pm");
-ok(-f $step->{templates}->{config_lib},
- "Able to locate template for config_lib");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-gen_config_pm-01.t - test gen::config_pm
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_config_pm-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test gen::config_pm.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::gen::config_pm, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/gen_core_pmcs-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_core_pmcs-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,77 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# gen_core_pmcs-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 16;
-use Carp;
-use lib qw( lib );
-use_ok('init::defaults');
-use_ok('auto::pmc');
-use_ok('config::gen::core_pmcs');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{auto::pmc}, $args );
-my $pkg = q{gen::core_pmcs};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my @pmc_names = split / /, $conf->data->get('pmc_names');
-ok( scalar( @pmc_names ),
- "Got nonzero number of pmc names, which is prerequisite for gen:core_pmcs");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-gen_core_pmcs-01.t - test gen::core_pmcs
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_core_pmcs-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test configuration step gen::core_pmcs. Since the step
-is primarily concerned with printing files based on reading of a list of
-C<pmc>s found within the Parrot::Configure object's data structure, we content
-ourselves with ensuring that that list has nonzero size.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::gen::core_pmcs, config::auto::pmc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/gen_crypto-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_crypto-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,84 +0,0 @@
-#! perl
-# Copyright (C) 2008, Parrot Foundation.
-# $Id$
-# gen_crypto-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 8;
-use Carp;
-use lib qw( lib );
-use_ok('config::gen::crypto');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $serialized = $conf->pcfreeze();
-
-my $pkg = q{gen::crypto};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-ok(-f $step->{digest_pmc_template}, "Able to locate source code file");
-
-my $has_crypto_orig = $conf->data->get('has_crypto');
-$conf->data->set( has_crypto => undef );
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-is($step->result(), q{skipped}, "Got expected result");
-# re-set for next test
-$conf->data->set( has_crypto => $has_crypto_orig );
-$step->set_result( q{} );
-
-$conf->replenish($serialized);
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
- gen_crypto-01.t - test gen::crypto
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_crypto-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test gen::crypto.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::gen::crypto, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/gen_makefiles-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_makefiles-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,226 +0,0 @@
-#! perl
-# Copyright (C) 2007-2009, Parrot Foundation.
-# $Id$
-# gen_makefiles-01.t
-
-use strict;
-use warnings;
-my @cond_tests;
-my @conf_args = ( true => 1, false => 0, value => 'xx' );
-BEGIN {
- @cond_tests =
- (
- # perl-syntax true or false
- ["IF(true)", 1],
- ["IF(false)", 0],
- ["UNLESS(true)", 0],
- ["UNLESS(false)", 1],
- ["IF(true | false)", 1],
- ["IF(true & false)", 0],
- ["IF(true or true)", 1],
- ["IF(true or false)", 1],
- ["IF(false or true)", 1],
- ["IF(false or false)", 0],
- ["IF(true and true)", 1],
- ["IF(true and false)", 0],
- ["IF(false and true)", 0],
- ["IF(false and false)", 0],
- ["UNLESS(true|false)", 0],
- ["UNLESS(true&false)", 1],
- ["IF(!false)", 1],
- ["IF(true)", 1],
- ["ELSIF(value)", 0],
- ["ELSE", 0],
- ["IF(false)", 0],
- ["ELSIF(value)", 1],
- ["ELSE", 0],
- ["IF(false)", 0],
- ["ELSIF(false)", 0],
- ["ELSE", 1],
- # Exercise the parser
- ["IF(true and (!false and value))", 1],
- ["IF(true and (!false) and value)", 1],
- ["IF(true and !false and value)", 1, 'no parens'],
- ["IF(true and not false and value)", 1, 'no parens'],
- ["IF(true&!false&value)", 1],
- ["IF(false or (!false and value))", 1, 'not parser problem'],
- ["UNLESS(!(true&!false&value))", 1, 'no ws, but nested parens'],
- ["IF(true&(!false&false))", 0, 'not precedence'],
- ["IF(true&(!false&value))", 1],
- ["IF(not true and value)", 0, 'not precedence over and'],
- ["IF(not false and value)", 1],
- ["IF((not false) and value)", 1],
- ["IF(not (false and value))", 1],
- ["IF(not (false or value))", 0],
- ["IF(true and not false)", 1],
- # platform
- ["IF(someplatform)", 1],
- ["IF(not someplatform)", 0],
- ["UNLESS(someplatform)", 0],
- ["UNLESS(not someplatform)", 1],
- # key==value
- ["IF(value==xx)", 1],
- ["IF(value==xxy)", 0],
- ["UNLESS(value==xx)", 0],
- ["UNLESS(value==xxy)", 1],
- ["IF(true & (value==xx & (!false)))",1],
- # These are invalid:
- #["IF(value == xx)", 0], # invalid op error
- #["IF(value = xx)", 0], # invalid op error
- ["IF(value=xx)", 0], # also invalid, no warning. checks for key value=xx
-
- # Legacy syntax true or false
- ["CONDITIONED_LINE(true)", 1],
- ["INVERSE_CONDITIONED_LINE(true)", 0],
- ["CONDITIONED_LINE(false)", 0],
- ["INVERSE_CONDITIONED_LINE(false)", 1],
- );
-}
-
-use Test::More tests => (8 + @cond_tests);
-use Carp;
-use lib qw( . lib );
-
-use_ok('config::gen::makefiles');
-
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new();
-my $pkg = 'gen::makefiles';
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-
-my $step = test_step_constructor_and_description($conf);
-my $missing_SOURCE = 0;
-my %makefiles = %{ $step->{makefiles} };
-
-foreach my $k ( keys %makefiles ) {
- $missing_SOURCE++ unless (-f $makefiles{$k}{SOURCE});
-}
-
-is($missing_SOURCE, 0, "No Makefile source file missing");
-ok(-f $step->{CFLAGS_source}, "CFLAGS source file located");
-
-my $index = undef;
-sub result {
- my $c = shift;
- my $s = $c->[0];
- $s =~ s/^\+/plus_/;
- $s =~ s/^\-/minus_/;
- $s =~ s/\|/OR/g;
- $s =~ s/\&/AND/g;
- $s =~ s/\!/NOT/g;
- $s =~ s/[\()]//g;
- $s =~ s/ /_/g;
- $s .= ("_".++$index) if $s =~ /^(ELSE|ELSIF)/;
-
- return $s."=".($c->[1]?"true":"false");
-}
-
-# test #IF(keys):line
-$conf->data->set( @conf_args, ('osname' => 'someplatform' ) );
-
-open my $IN, ">", "Makefile_$$.in";
-print $IN "# There should only be =true results in .out\n";
-for my $c (@cond_tests) {
- my $result = result($c);
- print $IN "#$c->[0]:$result\n";
-}
-
-close $IN;
-
-$conf->genfile("Makefile_$$.in", "Makefile_$$.out",
- (makefile => 1, conditioned_lines => 1));
-
-open my $OUT, "<", "Makefile_$$.out";
-
-my $f;
-{
- local $/;
- $f = <$OUT>;
-}
-
-close $OUT;
-$index = undef;
-
-for my $c (@cond_tests) {
- my $result = result($c);
- if ($c->[2] and $c->[2] =~ /^TODO(.*)$/) {
- local $TODO = $1;
- ok(($c->[1] ? $f =~ /^$result$/m : $f !~ /^$result$/m), "$result");
- }
- else {
- ok(($c->[1] ? $f =~ /^$result$/m : $f !~ /^$result$/m), "$result".($c->[2]?" $c->[2]":''));
- }
-}
-
-# TT #279: reporting the makefile line number
-# step gen::makefiles died during execution:
-# invalid op "IF" in "#IF(bla)" at "(bla)" at Configure.pl line 72
-open $IN, ">", "Makefile_$$.in";
-print $IN "# Test reporting sourcefile line numbers. TT #279\n";
-print $IN "#IF(IF(bla)):test\n";
-close $IN;
-eval {
- $conf->genfile("Makefile_$$.in", "Makefile_$$.out",
- (makefile => 1, conditioned_lines => 1));
-};
-
-my $error = $@;
-ok($error eq "invalid op \"bla\" in \"IF(bla)\" at \"(bla)\" at Makefile_$$.in line 2\n",
- "report correct error line");
-
-pass("Completed all tests in $0");
-
-END {
- unlink "Makefile_$$.in", "Makefile_$$.out", "Makefile_$$.out.tmp";
-}
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-gen_makefiles-01.t - test gen::makefiles
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_makefiles-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test gen::makefiles.
-
-=head1 AUTHOR
-
-James E Keenan
-Reini Urban
-
-=head1 SEE ALSO
-
-config::gen::makefiles, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/gen_opengl-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_opengl-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,67 +0,0 @@
-#! perl
-# Copyright (C) 2007-2008, Parrot Foundation.
-# $Id$
-# gen_opengl-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 5;
-use Carp;
-use lib qw( lib );
-use_ok('config::gen::opengl');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-my $pkg = q{gen::opengl};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
- gen_opengl-01.t - test gen::opengl
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_opengl-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test gen::opengl.
-
-=head1 AUTHOR
-
-Geoffrey Broadwell; modified from a similar file by James E Keenan.
-
-=head1 SEE ALSO
-
-config::gen::opengl, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/gen_parrot_include-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_parrot_include-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,73 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# gen_parrot_include-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 7;
-use Carp;
-use lib qw( lib );
-use_ok('config::gen::parrot_include');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-my $pkg = q{gen::parrot_include};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my %missing_files = ();
-foreach my $f ( @{ $step->{source_files} } ) {
- $missing_files{$f}++ unless (-f $f);
-}
-is(keys %missing_files, 0, "No needed source files are missing");
-ok(-d $step->{destdir}, "Directory needed has been located");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-gen_parrot_include-01.t - test gen::parrot_include
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_parrot_include-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test gen::parrot_include.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::gen::parrot_include, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/gen_platform-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/gen_platform-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,228 +0,0 @@
-#! perl
-# Copyright (C) 2007-2008, Parrot Foundation.
-# $Id$
-# gen_platform-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 19;
-use Carp;
-use Cwd;
-use File::Copy;
-use File::Path qw( mkpath );
-use File::Temp qw( tempdir );
-use File::Spec;
-use lib qw( lib );
-use_ok('config::gen::platform');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Parrot::Configure::Utils qw( _slurp );
-use IO::CaptureOutput qw( capture );
-
-########## regular ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-my $pkg = q{gen::platform};
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-ok(-f $step->{platform_interface},
- "Located required platform interface header");
-
-my $platform_orig = $conf->data->get_p5('OSNAME');
-my $archname_orig = $conf->data->get_p5('archname');
-$conf->data->set_p5( archname => 'foo-bar' );
-my $verbose = 0;
-
-########## _get_platform() ##########
-
-$conf->data->set_p5( OSNAME => 'msys' );
-is( $step->_get_platform( $conf, $verbose ), q{win32},
- "Got expected platform for msys");
-
-$conf->data->set_p5( OSNAME => 'mingw' );
-is( $step->_get_platform( $conf, $verbose ), q{win32},
- "Got expected platform for mingw");
-
-$conf->data->set_p5( OSNAME => 'MSWin32' );
-is( $step->_get_platform( $conf, $verbose ), q{win32},
- "Got expected platform for MSWin32");
-
-# re-set to original values
-$conf->data->set_p5( OSNAME => $platform_orig );
-$conf->data->set_p5( archname => $archname_orig );
-
-$conf->data->set_p5( archname => 'ia64-bar' );
-is( $step->_get_platform( $conf, $verbose ), q{ia64},
- "Got expected platform for ia64");
-
-$conf->data->set_p5( archname => 'foo-bar' );
-$conf->data->set_p5( OSNAME => 'foo' );
-{
- $verbose = 1;
- my ($stdout, $stderr, $rv);
- my $expected = q{generic};
- capture(
- sub { $rv = $step->_get_platform( $conf, $verbose ) },
- \$stdout,
- \$stderr,
- );
- is( $rv, $expected, "Got expected platform for foo");
- like( $stdout, qr/platform='$expected'/, "Got expected verbose output");
-}
-
-# re-set to original values
-$conf->data->set_p5( archname => $archname_orig );
-$conf->data->set_p5( OSNAME => $platform_orig );
-
-########## _get_generated() ##########
-
-my $TEMP_generated_orig = $conf->data->get('TEMP_generated');
-{
- $verbose = 1;
- my ($stdout, $stderr, $rv);
- my $expected = q{foo};
- $conf->data->set( TEMP_generated => $expected );
- capture(
- sub { $rv = $step->_get_generated( $conf, $verbose ) },
- \$stdout,
- \$stderr,
- );
- is( $rv, $expected, "Got expected generated");
- like( $stdout, qr/\($expected\)/, "Got expected verbose output");
-}
-$conf->data->set( TEMP_generated => undef );
-$verbose = 0;
-is( $step->_get_generated( $conf, $verbose ), q{},
- "Got expected generated");
-
-# re-set to original values
-$conf->data->set( TEMP_generated => $TEMP_generated_orig );
-
-########## _handle_asm() ##########
-
-my $platform_asm_orig = $conf->data->get('platform_asm');
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- $conf->data->set( platform_asm => 1 );
- my $platform = 'aix';
- mkpath( 'src', { mode => 0755 } ) or croak "Unable to make testing directory";
- my $asmfile = File::Spec->catfile( 'src', 'platform_asm.s' );
- open my $FH, '>', $asmfile or croak "Unable to open handle for writing";
- print $FH "Hello asm\n";
- close $FH or croak "Unable to close handle after writing";
- $step->_handle_asm($conf, $platform);
- my $text = _slurp( $asmfile );
- like($text, qr/Hello asm/s, "File unchanged, as expected");
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-# re-set to original values
-$conf->data->set( platform_asm => $platform_asm_orig );
-
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- $conf->data->set( platform_asm => 1 );
- my $platform = 'aix';
-
- mkpath( 'src', { mode => 0755 } ) or croak "Unable to make testing directory";
-
- my $asmfile = File::Spec->catfile( 'src', 'platform_asm.s' );
- open my $FH, '>', $asmfile or croak "Unable to open handle for writing";
- print $FH "Hello asm\n";
- close $FH or croak "Unable to close handle after writing";
-
- my $path = File::Spec->catdir( 'config', 'gen', 'platform', $platform );
- mkpath( $path, { mode => 0755 } ) or croak "Unable to make testing directory";
-
- my $configfile = File::Spec->catfile( $path, 'asm.s' );
- open my $FH2, '>', $configfile or croak "Unable to open handle for writing";
- print $FH2 "Goodbye world\n";
- close $FH2 or croak "Unable to close handle after writing";
-
- $step->_handle_asm($conf, $platform);
-
- my $text = _slurp( $asmfile );
- like($text, qr/Goodbye world/s, "File changed, as expected");
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-# re-set to original values
-$conf->data->set( platform_asm => $platform_asm_orig );
-
-########## _handle_begin_c() ##########
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to temporary directory";
- my $platform = 'darwin';
-
- my $path = File::Spec->catdir( 'config', 'gen', 'platform', $platform );
- mkpath( $path, { mode => 0755 } ) or croak "Unable to make testing directory";
- copy qq{$cwd/config/gen/platform/$platform/begin.c},
- qq{$path/begin.c}
- or croak "Unable to copy file for testing";
-
- mkpath( 'src', { mode => 0755 } ) or croak "Unable to make testing directory";
- my $plat_c = q{src/platform.c};
- open my $PLATFORM_C, '>', $plat_c
- or croak "Unable to open handle for writing";
- $step->_handle_begin_c($platform, $PLATFORM_C);
- close $PLATFORM_C or croak "Unable to close handle after writing";
-
- my $text = _slurp( $plat_c );
- like($text, qr/#undef environ.*#undef bool/s,
- "Got expected text in header file");
- unlike($text, qr/Local variables/s, "Coda stripped, as desired");
-
- chdir $cwd or croak "Unable to change back to starting directory";
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-gen_platform-01.t - test gen::platform
-
-=head1 SYNOPSIS
-
- % prove t/steps/gen_platform-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test gen::platform.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::gen::platform, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Copied and modified: branches/tt761_keys_revamp/t/steps/init/defaults-01.t (from r39980, branches/tt761_keys_revamp/t/steps/init_defaults-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_defaults-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/init/defaults-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# init_defaults-01.t
+# init/defaults-01.t
use strict;
use warnings;
@@ -153,11 +153,11 @@
=head1 NAME
-init_defaults-01.t - test init::defaults
+init/defaults-01.t - test init::defaults
=head1 SYNOPSIS
- % prove t/steps/init_defaults-01.t
+ % prove t/steps/init/defaults-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/init/headers-01.t (from r39980, branches/tt761_keys_revamp/t/steps/init_headers-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_headers-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/init/headers-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# init_headers-01.t
+# init/headers-01.t
use strict;
use warnings;
@@ -65,11 +65,11 @@
=head1 NAME
-init_headers-01.t - test init::headers
+init/headers-01.t - test init::headers
=head1 SYNOPSIS
- % prove t/steps/init_headers-01.t
+ % prove t/steps/init/headers-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/init/hints-01.t (from r39980, branches/tt761_keys_revamp/t/steps/init_hints-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_hints-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/init/hints-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# init_hints-01.t
+# init/hints-01.t
use strict;
use warnings;
@@ -173,11 +173,11 @@
=head1 NAME
-init_hints-01.t - test init::hints
+init/hints-01.t - test init::hints
=head1 SYNOPSIS
- % prove t/steps/init_hints-01.t
+ % prove t/steps/init/hints-01.t
=head1 DESCRIPTION
Added: branches/tt761_keys_revamp/t/steps/init/hints/darwin-01.t
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/tt761_keys_revamp/t/steps/init/hints/darwin-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -0,0 +1,45 @@
+#! perl
+# Copyright (C) 2009, Parrot Foundation.
+# $Id$
+# init/hints/darwin-01.t
+
+use strict;
+use warnings;
+use Test::More; # tests => 26;
+plan( skip_all => 'only needs testing on Darwin' ) unless $^O =~ /darwin/i;
+plan( tests => 1 );
+
+pass("Completed all tests in $0");
+
+################### DOCUMENTATION ###################
+
+=head1 NAME
+
+init/hints/darwin-01.t - test init::hints::darwin
+
+=head1 SYNOPSIS
+
+ % prove t/steps/init/hints/darwin-01.t
+
+=head1 DESCRIPTION
+
+The files in this directory test functionality used by F<Configure.pl>.
+
+The tests in this file test init::hints::darwin.
+
+=head1 AUTHOR
+
+James E Keenan
+
+=head1 SEE ALSO
+
+config::init::hints::darwin, F<Configure.pl>.
+
+=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Copied and modified: branches/tt761_keys_revamp/t/steps/init/install-01.t (from r39980, branches/tt761_keys_revamp/t/steps/init_install-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_install-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/init/install-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# init_install-01.t
+# init/install-01.t
use strict;
use warnings;
use Test::More tests => 36;
@@ -108,11 +108,11 @@
=head1 NAME
-init_install-01.t - test init::install
+init/install-01.t - test init::install
=head1 SYNOPSIS
- % prove t/steps/init_install-01.t
+ % prove t/steps/init/install-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/init/manifest-01.t (from r39980, branches/tt761_keys_revamp/t/steps/init_manifest-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_manifest-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/init/manifest-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# init_manifest-01.t
+# init/manifest-01.t
use strict;
use warnings;
@@ -93,11 +93,11 @@
=head1 NAME
-init_manifest-01.t - test init::manifest
+init/manifest-01.t - test init::manifest
=head1 SYNOPSIS
- % prove t/steps/init_manifest-01.t
+ % prove t/steps/init/manifest-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/init/optimize-01.t (from r39980, branches/tt761_keys_revamp/t/steps/init_optimize-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_optimize-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/init/optimize-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# init_optimize-01.t
+# init/optimize-01.t
use strict;
use warnings;
use Test::More tests => 33;
@@ -125,11 +125,11 @@
=head1 NAME
-init_optimize-01.t - test init::optimize
+init/optimize-01.t - test init::optimize
=head1 SYNOPSIS
- % prove t/steps/init_optimize-01.t
+ % prove t/steps/init/optimize-01.t
=head1 DESCRIPTION
Deleted: branches/tt761_keys_revamp/t/steps/init_defaults-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_defaults-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,183 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# init_defaults-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 39;
-use Carp;
-use Cwd;
-use File::Copy;
-use File::Temp qw| tempdir |;
-use lib qw( lib );
-use_ok('config::init::defaults');
-use Parrot::Configure;
-use Parrot::Configure::Step;
-use Parrot::Configure::Options qw( process_options );
-use base qw(Parrot::Configure::Step);
-use Parrot::Configure::Test qw(
- test_step_constructor_and_description
-);
-
-########## no debugging; profile; m 32 ##########
-
-my $pkg = q{init::defaults};
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--debugging=0}, q{--profile}, q{--m=32} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-
-$conf->replenish($serialized);
-
-########## mock absence of 'DEVELOPING' ##########
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- ok( chdir $tdir, "Changed to temporary directory for testing" );
- ok( copy( "$cwd/VERSION", "$tdir/VERSION" ),
- "Able to copy VERSION for testing" );
-
- my $pkg = q{init::defaults};
- my ($args, $step_list_ref) = process_options(
- {
- argv => [],
- mode => q{configure},
- }
- );
- $conf->options->set( %{$args} );
- my $step = test_step_constructor_and_description($conf);
-
- my $ret = $step->runstep($conf);
- ok( defined $ret, "runstep() returned defined value" );
-
- unlink "$tdir/VERSION"
- or croak "Unable to unlink file from tempdir after testing";
- ok( chdir $cwd, "Able to change back to directory after testing" );
-}
-
-$conf->replenish($serialized);
-
-########## m 32 ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--m=32} ],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$conf->data->set( archname => 'x86_64' );
-$conf->data->set( cc => 'cc' );
-$conf->data->set( cxx => 'c++' );
-$conf->data->set( link => 'cc' );
-$conf->data->set( ld => 'env cc' );
-$conf->data->set( ld_load_flags => '-bundle -L/usr/local/lib64' );
-$conf->data->set( ld_share_flags => '-bundle -L/usr/local/lib64' );
-$conf->data->set( ldflags => '-bundle -L/usr/local/lib64' );
-$conf->data->set( linkflags => '-bundle -L/usr/local/lib64' );
-ok(init::defaults::_64_bit_adjustments($conf),
- "_64_bit_adjustments() returned true");
-is($conf->data->get( 'archname' ), 'i386', "Got expected value for 'archname'");
-is($conf->data->get( 'cc' ), 'cc -m32', "Got expected value for 'cc'");
-is($conf->data->get( 'cxx' ), 'c++ -m32', "Got expected value for 'cxx'");
-is($conf->data->get( 'link' ), 'cc -m32', "Got expected value for 'link'");
-is($conf->data->get( 'ld' ), 'env cc -m32', "Got expected value for 'ld'");
-is($conf->data->get( 'ld_load_flags' ), '-bundle -L/usr/local/lib',
- "Got expected value for 'ld_load_flags'");
-is($conf->data->get( 'ld_share_flags' ), '-bundle -L/usr/local/lib',
- "Got expected value for 'ld_share_flags");
-is($conf->data->get( 'ldflags' ), '-bundle -L/usr/local/lib',
- "Got expected value for 'ldflags'");
-is($conf->data->get( 'linkflags' ), '-bundle -L/usr/local/lib',
- "Got expected value for 'linkflags'");
-
-$conf->replenish($serialized);
-
-########## regular ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ ],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$conf->data->set( archname => 'x86_64' );
-$conf->data->set( cc => 'cc' );
-$conf->data->set( cxx => 'c++' );
-$conf->data->set( link => 'cc' );
-$conf->data->set( ld => 'env cc' );
-$conf->data->set( ld_load_flags => '-bundle -L/usr/local/lib64' );
-$conf->data->set( ld_share_flags => '-bundle -L/usr/local/lib64' );
-$conf->data->set( ldflags => '-bundle -L/usr/local/lib64' );
-$conf->data->set( linkflags => '-bundle -L/usr/local/lib64' );
-ok(init::defaults::_64_bit_adjustments($conf),
- "_64_bit_adjustments() returned true");
-is($conf->data->get( 'archname' ), 'x86_64', "Got expected value for 'archname'");
-is($conf->data->get( 'cc' ), 'cc', "Got expected value for 'cc'");
-is($conf->data->get( 'cxx' ), 'c++', "Got expected value for 'cxx'");
-is($conf->data->get( 'link' ), 'cc', "Got expected value for 'link'");
-is($conf->data->get( 'ld' ), 'env cc', "Got expected value for 'ld'");
-is($conf->data->get( 'ld_load_flags' ), '-bundle -L/usr/local/lib64',
- "Got expected value for 'ld_load_flags'");
-is($conf->data->get( 'ld_share_flags' ), '-bundle -L/usr/local/lib64',
- "Got expected value for 'ld_share_flags");
-is($conf->data->get( 'ldflags' ), '-bundle -L/usr/local/lib64',
- "Got expected value for 'ldflags'");
-is($conf->data->get( 'linkflags' ), '-bundle -L/usr/local/lib64',
- "Got expected value for 'linkflags'");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-init_defaults-01.t - test init::defaults
-
-=head1 SYNOPSIS
-
- % prove t/steps/init_defaults-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test init::defaults.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::init::defaults, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/init_headers-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_headers-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,95 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# init_headers-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 7;
-use Carp;
-use Cwd;
-use File::Copy;
-use File::Temp qw(tempdir);
-use Tie::File;
-use lib qw( lib );
-use_ok('config::init::headers');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-
-my $pkg = q{init::headers};
-my ($args, $step_list_ref) = process_options(
- {
- argv => [],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-
-my $task = $conf->steps->[-1];
-my $step_name = $task->step;
-
-my $step = $step_name->new();
-ok( defined $step, "$step_name constructor returned defined value" );
-isa_ok( $step, $step_name );
-ok( $step->description(), "$step_name has description" );
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to tempdir for testing";
- copy qq{$cwd/MANIFEST}, qq{$tdir/MANIFEST}
- or croak "Unable to copy MANIFEST for testing";
- my @lines;
- tie @lines, 'Tie::File', qq{$tdir/MANIFEST}
- or croak "Unable to tie to temporary MANIFEST";
- push @lines, q{include/parrot/phony.h [main]include};
- untie @lines;
- my $ret = $step->runstep($conf);
- ok( defined $ret, "runstep() returned defined value" );
- like( $conf->data->get(q{TEMP_nongen_headers}), qr{\$\(INC_DIR\)/phony\.h\\},
-qq{Header added to MANIFEST for testing purposes correctly detected in Parrot::Configure object data structure}
- );
-
- unlink qq{$tdir/MANIFEST}
- or croak "Unable to delete file after testing";
- chdir $cwd
- or croak "Unable to change back to starting directory after testing";
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-init_headers-01.t - test init::headers
-
-=head1 SYNOPSIS
-
- % prove t/steps/init_headers-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test init::headers.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::init::headers, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/init_hints-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_hints-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,203 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# init_hints-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 26;
-use Carp;
-use Cwd;
-use File::Path ();
-use File::Spec::Functions qw/catfile/;
-use File::Temp qw(tempdir);
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::hints');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw | capture |;
-
-########## --verbose ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--verbose}],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{init::hints};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-# need to capture the --verbose output, because the fact that it does not end
-# in a newline confuses Test::Harness
-{
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf)}, \$stdout);
- ok( $stdout, "verbose output: hints were captured" );
- ok( defined $rv, "runstep() returned defined value" );
-}
-
-$conf->replenish($serialized);
-
-########## --verbose; local hints directory ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [q{--verbose}],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- File::Path::mkpath(qq{$tdir/init/hints})
- or croak "Unable to create directory for local hints";
- my $localhints = qq{$tdir/init/hints/local.pm};
- open my $FH, '>', $localhints
- or croak "Unable to open temp file for writing";
- print $FH <<END;
-package init::hints::local;
-use strict;
-sub runstep {
- return 1;
-}
-1;
-END
- close $FH or croak "Unable to close temp file after writing";
- unshift( @INC, $tdir );
-
- {
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf)}, \$stdout);
- ok( $stdout, "verbose output: hints were captured" );
- ok( defined $rv, "runstep() returned defined value" );
- }
- unlink $localhints or croak "Unable to delete $localhints";
-}
-
-$conf->replenish($serialized);
-
-########## --verbose; local hints directory; no runstep() in local hints ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [q{--verbose}],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- File::Path::mkpath(qq{$tdir/init/hints})
- or croak "Unable to create directory for local hints";
- my $localhints = qq{$tdir/init/hints/local.pm};
- open my $FH, '>', $localhints
- or croak "Unable to open temp file for writing";
- print $FH <<END;
-package init::hints::local;
-use strict;
-1;
-END
- close $FH or croak "Unable to close temp file after writing";
- unshift( @INC, $tdir );
-
- {
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf)}, \$stdout);
- ok( $stdout, "verbose output: hints were captured" );
- ok( defined $rv, "runstep() returned defined value" );
- }
- unlink $localhints or croak "Unable to delete $localhints";
-}
-
-$conf->replenish($serialized);
-
-########## --verbose; imaginary OS ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--verbose} ],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my ($stdout, $stderr, $ret);
- $conf->data->set_p5( OSNAME => q{imaginaryOS} );
- my $osname = lc( $conf->data->get_p5( 'OSNAME' ) );
- my $hints_file = catfile('config', 'init', 'hints', "$osname.pm");
- capture (
- sub { $ret = $step->runstep($conf); },
- \$stdout,
- \$stderr,
- );;
- like(
- $stdout,
- qr/No \Q$hints_file\E found/s,
- "Got expected verbose output when no hints file found"
- );
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-init_hints-01.t - test init::hints
-
-=head1 SYNOPSIS
-
- % prove t/steps/init_hints-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test init::hints.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::init::hints, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/init_install-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_install-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,138 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# init_install-01.t
-use strict;
-use warnings;
-use Test::More tests => 36;
-use Carp;
-use Cwd;
-use File::Temp qw(tempdir);
-use lib qw( lib t/configure/testlib );
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use_ok('config::init::install');
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- my $tdir1 = tempdir( CLEANUP => 1 );
- my ($args, $step_list_ref) = process_options(
- {
- argv => [
- qq{--prefix=$tdir}, qq{--exec-prefix=$tdir},
- qq{--bindir=$tdir1}, qq{--sbindir=$tdir1},
- qq{--libexecdir=$tdir1}, qq{--datadir=$tdir1},
- qq{--sysconfdir=$tdir1}, qq{--sharedstatedir=$tdir1},
- qq{--localstatedir=$tdir1}, qq{--libdir=$tdir1},
- qq{--includedir=$tdir1}, qq{--oldincludedir=$tdir1},
- qq{--infodir=$tdir1}, qq{--mandir=$tdir1},
- ],
- mode => q{configure},
- }
- );
-
- my $conf = Parrot::Configure->new;
-
- my $serialized = $conf->pcfreeze();
-
- test_step_thru_runstep( $conf, q{init::install}, $args );
-
- is( $conf->data->get('prefix'), $tdir, "--prefix option confirmed" );
- is( $conf->data->get('exec_prefix'), $tdir, "--exec-prefix option confirmed" );
- is( $conf->data->get('bindir'), $tdir1, "--bindir option confirmed" );
- is( $conf->data->get('sbindir'), $tdir1, "--sbindir option confirmed" );
- is( $conf->data->get('libexecdir'), $tdir1, "--libexecdir option confirmed" );
- is( $conf->data->get('datadir'), $tdir1, "--datadir option confirmed" );
- is( $conf->data->get('sharedstatedir'), $tdir1, "--sharedstatedir option confirmed" );
- is( $conf->data->get('localstatedir'), $tdir1, "--localstatedir option confirmed" );
- is( $conf->data->get('libdir'), $tdir1, "--libdir option confirmed" );
- is( $conf->data->get('includedir'), $tdir1, "--includedir option confirmed" );
- is( $conf->data->get('oldincludedir'), $tdir1, "--oldincludedir option confirmed" );
- is( $conf->data->get('infodir'), $tdir1, "--infodir option confirmed" );
- is( $conf->data->get('mandir'), $tdir1, "--mandir option confirmed" );
-
- $conf->replenish($serialized);
-
- my $tdir2 = tempdir( CLEANUP => 1 );
- my $tdir_orig = $tdir2;
- $tdir2 .= q{/};
- my $tdir3 = tempdir( CLEANUP => 1 );
- ($args, $step_list_ref) = process_options(
- {
- argv => [
- qq{--prefix=$tdir2}, qq{--exec-prefix=$tdir2},
- qq{--bindir=$tdir3}, qq{--sbindir=$tdir3},
- qq{--libexecdir=$tdir3}, qq{--datadir=$tdir3},
- qq{--sysconfdir=$tdir3}, qq{--sharedstatedir=$tdir3},
- qq{--localstatedir=$tdir3}, qq{--libdir=$tdir3},
- qq{--includedir=$tdir3}, qq{--oldincludedir=$tdir3},
- qq{--infodir=$tdir3}, qq{--mandir=$tdir3},
- ],
- mode => q{configure},
- }
- );
-
- my $pkg = q{init::install};
- $conf->add_steps($pkg);
- $conf->options->set( %{$args} );
- my $step = test_step_constructor_and_description($conf);
-
- my $ret = $step->runstep($conf);
- ok( defined $ret, "runstep() returned defined value" );
-
- is( $conf->data->get('prefix'),
- $tdir_orig, "--prefix option confirmed; trailing slash stripped" );
- is( $conf->data->get('exec_prefix'),
- $tdir_orig, "--exec-prefix option confirmed; trailing slash stripped" );
- is( $conf->data->get('bindir'), $tdir3, "--bindir option confirmed" );
- is( $conf->data->get('sbindir'), $tdir3, "--sbindir option confirmed" );
- is( $conf->data->get('libexecdir'), $tdir3, "--libexecdir option confirmed" );
- is( $conf->data->get('datadir'), $tdir3, "--datadir option confirmed" );
- is( $conf->data->get('sharedstatedir'), $tdir3, "--sharedstatedir option confirmed" );
- is( $conf->data->get('localstatedir'), $tdir3, "--localstatedir option confirmed" );
- is( $conf->data->get('libdir'), $tdir3, "--libdir option confirmed" );
- is( $conf->data->get('includedir'), $tdir3, "--includedir option confirmed" );
- is( $conf->data->get('oldincludedir'), $tdir3, "--oldincludedir option confirmed" );
- is( $conf->data->get('infodir'), $tdir3, "--infodir option confirmed" );
- is( $conf->data->get('mandir'), $tdir3, "--mandir option confirmed" );
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-init_install-01.t - test init::install
-
-=head1 SYNOPSIS
-
- % prove t/steps/init_install-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test init::install.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::init::install, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/init_manifest-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_manifest-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,124 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# init_manifest-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-use Carp;
-use Cwd;
-use File::Copy;
-use File::Temp qw(tempdir);
-use lib qw( lib );
-use_ok('config::init::manifest');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use IO::CaptureOutput qw | capture |;
-
-########## no manifest check ##########
-
-my $pkg = q{init::manifest};
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--nomanicheck}],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-
-my $task = $conf->steps->[-1];
-my $step_name = $task->step;
-
-my $step = $step_name->new();
-ok( defined $step, "$step_name constructor returned defined value" );
-isa_ok( $step, $step_name );
-ok( $step->description(), "$step_name has description" );
-
-ok(defined ($step->result), "result defined");
-ok(! ($step->result), "result not yet true");
-my $ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-is( $step->result, q{skipped},
- "Because of --nomanicheck, result is 'skipped'." );
-
-$conf->replenish($serialized);
-
-########## mock missing files ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-
-$task = $conf->steps->[-1];
-$step_name = $task->step;
-
-$step = $step_name->new();
-ok( defined $step, "$step_name constructor returned defined value" );
-isa_ok( $step, $step_name );
-
-my $cwd = cwd();
-{
- my $tdir = tempdir( CLEANUP => 1 );
- chdir $tdir or croak "Unable to change to tempdir";
- copy( qq{$cwd/MANIFEST}, qq{$tdir/MANIFEST} )
- or croak "Unable to copy MANIFEST";
- {
- my ($rv, $stdout, $stderr);
- capture(
- sub { $rv = $step->runstep($conf); },
- \$stdout,
- \$stderr,
- );
- is( $rv, undef, "runstep returned undef" );
- }
- unlink qq{$tdir/MANIFEST}
- or croak "Unable to delete file after testing";
- chdir $cwd or croak "Unable to change back";
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-init_manifest-01.t - test init::manifest
-
-=head1 SYNOPSIS
-
- % prove t/steps/init_manifest-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test methods found in config::init::manifest.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::init::manifest, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
-
Deleted: branches/tt761_keys_revamp/t/steps/init_optimize-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/init_optimize-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,155 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# init_optimize-01.t
-use strict;
-use warnings;
-use Test::More tests => 33;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::optimize');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use IO::CaptureOutput qw | capture |;
-
-########## no optimization (default) ##########
-
-my ($args, $step_list_ref) = process_options( {
- argv => [],
- mode => q{configure},
-} );
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{init::optimize};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-
-$conf->replenish($serialized);
-
-########## --optimize ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [q{--optimize}],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-
-$conf->replenish($serialized);
-
-########## --verbose ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [q{--verbose}],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf) }, \$stdout);
- ok( defined $rv, "step_name runstep() returned defined value" );
- ok( $stdout, "verbose output captured" );
-}
-
-$conf->replenish($serialized);
-
-########## --optimize=O2 ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [q{--optimize=O2}],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-
-$conf->replenish($serialized);
-
-########## --optimize; gcc 3.3 ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [q{--optimize}],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('gccversion' => '3.3');
-$ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-
-$conf->replenish($serialized);
-
-########## --optimize, --verbose; gcc 4.1 ##########
-
-($args, $step_list_ref) = process_options( {
- argv => [q{--optimize}, q{--verbose}],
- mode => q{configure},
-} );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('gccversion' => '4.1');
-# need to capture the --verbose output,
-# because the fact that it does not end
-# in a newline confuses Test::Harness
-{
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf) }, \$stdout);
- ok( defined $rv, "runstep() returned defined value" );
- ok( $stdout, "verbose output captured" );
-}
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-init_optimize-01.t - test init::optimize
-
-=head1 SYNOPSIS
-
- % prove t/steps/init_optimize-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test init::optimize.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::init::optimize, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/charset-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_charset-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_charset-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/charset-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_charset-01.t
+# inter/charset-01.t
use strict;
use warnings;
@@ -87,11 +87,11 @@
=head1 NAME
-inter_charset-01.t - test inter::charset
+inter/charset-01.t - test inter::charset
=head1 SYNOPSIS
- % prove t/steps/inter_charset-01.t
+ % prove t/steps/inter/charset-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/encoding-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_encoding-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_encoding-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/encoding-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_encoding-01.t
+# inter/encoding-01.t
use strict;
use warnings;
@@ -83,11 +83,11 @@
=head1 NAME
-inter_encoding-01.t - test inter::encoding
+inter/encoding-01.t - test inter::encoding
=head1 SYNOPSIS
- % prove t/steps/inter_encoding-01.t
+ % prove t/steps/inter/encoding-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/lex-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_lex-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_lex-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/lex-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2008, Parrot Foundation.
# $Id$
-# inter_lex-01.t
+# inter/lex-01.t
use strict;
use warnings;
@@ -144,11 +144,11 @@
=head1 NAME
-inter_lex-01.t - test inter::lex
+inter/lex-01.t - test inter::lex
=head1 SYNOPSIS
- % prove t/steps/inter_lex-01.t
+ % prove t/steps/inter/lex-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/lex-02.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_lex-02.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_lex-02.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/lex-02.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_lex-02.t
+# inter/lex-02.t
use strict;
use warnings;
@@ -48,11 +48,11 @@
=head1 NAME
-inter_lex-02.t - test inter::lex
+inter/lex-02.t - test inter::lex
=head1 SYNOPSIS
- % prove t/steps/inter_lex-02.t
+ % prove t/steps/inter/lex-02.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/lex-03.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_lex-03.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_lex-03.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/lex-03.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_lex-03.t
+# inter/lex-03.t
use strict;
use warnings;
@@ -76,11 +76,11 @@
=head1 NAME
-inter_lex-03.t - test inter::lex
+inter/lex-03.t - test inter::lex
=head1 SYNOPSIS
- % prove t/steps/inter_lex-03.t
+ % prove t/steps/inter/lex-03.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/libparrot-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_libparrot-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_libparrot-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/libparrot-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_libparrot-01.t
+# inter/libparrot-01.t
use strict;
use warnings;
@@ -269,11 +269,11 @@
=head1 NAME
-inter_libparrot-01.t - test inter::libparrot
+inter/libparrot-01.t - test inter::libparrot
=head1 SYNOPSIS
- % prove t/steps/inter_libparrot-01.t
+ % prove t/steps/inter/libparrot-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/make-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_make-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_make-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/make-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_make-01.t
+# inter/make-01.t
use strict;
use warnings;
@@ -87,11 +87,11 @@
=head1 NAME
-inter_make-01.t - test inter::make
+inter/make-01.t - test inter::make
=head1 SYNOPSIS
- % prove t/steps/inter_make-01.t
+ % prove t/steps/inter/make-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/progs-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_progs-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_progs-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/progs-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_progs-01.t
+# inter/progs-01.t
use strict;
use warnings;
@@ -100,11 +100,11 @@
=head1 NAME
-inter_progs-01.t - test inter::progs
+inter/progs-01.t - test inter::progs
=head1 SYNOPSIS
- % prove t/steps/inter_progs-01.t
+ % prove t/steps/inter/progs-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/progs-02.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_progs-02.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_progs-02.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/progs-02.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_progs-02.t
+# inter/progs-02.t
use strict;
use warnings;
@@ -100,11 +100,11 @@
=head1 NAME
-inter_progs-02.t - test inter::progs
+inter/progs-02.t - test inter::progs
=head1 SYNOPSIS
- % prove t/steps/inter_progs-02.t
+ % prove t/steps/inter/progs-02.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/progs-03.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_progs-03.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_progs-03.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/progs-03.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_progs-03.t
+# inter/progs-03.t
use strict;
use warnings;
@@ -100,11 +100,11 @@
=head1 NAME
-inter_progs-03.t - test inter::progs
+inter/progs-03.t - test inter::progs
=head1 SYNOPSIS
- % prove t/steps/inter_progs-03.t
+ % prove t/steps/inter/progs-03.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/progs-04.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_progs-04.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_progs-04.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/progs-04.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_progs-04.t
+# inter/progs-04.t
use strict;
use warnings;
@@ -91,11 +91,11 @@
=head1 NAME
-inter_progs-04.t - test inter::progs
+inter/progs-04.t - test inter::progs
=head1 SYNOPSIS
- % prove t/steps/inter_progs-04.t
+ % prove t/steps/inter/progs-04.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/shlibs-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_shlibs-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_shlibs-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/shlibs-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_shlibs-01.t
+# inter/shlibs-01.t
use strict;
use warnings;
@@ -96,11 +96,11 @@
=head1 NAME
-inter_shlibs-01.t - test inter::shlibs
+inter/shlibs-01.t - test inter::shlibs
=head1 SYNOPSIS
- % prove t/steps/inter_shlibs-01.t
+ % prove t/steps/inter/shlibs-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/types-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_types-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_types-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/types-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_types-01.t
+# inter/types-01.t
use strict;
use warnings;
@@ -80,11 +80,11 @@
=head1 NAME
-inter_types-01.t - test inter::types
+inter/types-01.t - test inter::types
=head1 SYNOPSIS
- % prove t/steps/inter_types-01.t
+ % prove t/steps/inter/types-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/yacc-01.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_yacc-01.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_yacc-01.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/yacc-01.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007-2008, Parrot Foundation.
# $Id$
-# inter_yacc-01.t
+# inter/yacc-01.t
use strict;
use warnings;
@@ -147,11 +147,11 @@
=head1 NAME
-inter_yacc-01.t - test inter::yacc
+inter/yacc-01.t - test inter::yacc
=head1 SYNOPSIS
- % prove t/steps/inter_yacc-01.t
+ % prove t/steps/inter/yacc-01.t
=head1 DESCRIPTION
Copied and modified: branches/tt761_keys_revamp/t/steps/inter/yacc-02.t (from r39980, branches/tt761_keys_revamp/t/steps/inter_yacc-02.t)
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_yacc-02.t Fri Jul 10 21:46:17 2009 (r39980, copy source)
+++ branches/tt761_keys_revamp/t/steps/inter/yacc-02.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -1,7 +1,7 @@
#! perl
# Copyright (C) 2007, Parrot Foundation.
# $Id$
-# inter_yacc-02.t
+# inter/yacc-02.t
use strict;
use warnings;
@@ -49,11 +49,11 @@
=head1 NAME
-inter_yacc-02.t - test inter::yacc
+inter/yacc-02.t - test inter::yacc
=head1 SYNOPSIS
- % prove t/steps/inter_yacc-02.t
+ % prove t/steps/inter/yacc-02.t
=head1 DESCRIPTION
Deleted: branches/tt761_keys_revamp/t/steps/inter_charset-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_charset-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,117 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_charset-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 17;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::charset');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-
-########## ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{inter::charset};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-$conf->replenish($serialized);
-
-########## ask ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my ( @prompts, $object );
-
-$conf->options->set('intval' => 'alpha');
-$conf->options->set('floatval' => 'beta');
-$conf->options->set('opcode' => 'gamma');
- at prompts = qw( delta epsilon zeta );
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-undef $object;
-untie *STDIN;
- at prompts = ();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_charset-01.t - test inter::charset
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_charset-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::charset.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::charset, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_encoding-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_encoding-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,113 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_encoding-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 17;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::encoding');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-
-########## no ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{inter::encoding};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-$conf->replenish($serialized);
-
-########## ask; $ENV{TEST_ENCODING} ##########
-
-$ENV{TEST_ENCODING} = 'fixed_8.c';
-do config::inter::encoding;
-($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my ( @prompts, $prompt, $object );
-$prompt = $ENV{TEST_ENCODING};
-push @prompts, $prompt;
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-undef $object;
-untie *STDIN;
- at prompts = ();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_encoding-01.t - test inter::encoding
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_encoding-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::encoding.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::encoding, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_lex-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_lex-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,174 +0,0 @@
-#! perl
-# Copyright (C) 2007-2008, Parrot Foundation.
-# $Id$
-# inter_lex-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 31;
-use Carp;
-use Data::Dumper;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::lex');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- rerun_defaults_for_testing
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-use IO::CaptureOutput qw | capture |;
-
-########## ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{inter::lex};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-is( $step->result(), q{skipped}, "Step was skipped as expected; no '--maintainer' option" );
-# re-set for next test
-$step->set_result(q{});
-
-$conf->replenish($serialized);
-
-########## ask; maintainer; $ENV{LEX} ##########
-
-$ENV{LEX} = 'foobar';
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer} ],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-my $result_expected = q{user defined};
-is( $step->result(), $result_expected,
- "Result was $result_expected because environment variable was set" );
-# re-set for next test
-delete $ENV{LEX};
-$step->set_result('');
-
-$conf->replenish($serialized);
-
-########## ask; maintainer; lex=flex ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer}, q{--lex=flex} ],
- mode => q{configure},
- }
-);
-my ( @prompts, $object, @entered );
- at prompts = map { q{foo_} . $_ } qw| alpha |;
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-$result_expected = q{user defined};
-is( $step->result(), $result_expected, "Result was $result_expected" );
-$object = undef;
-untie *STDIN;
-# re-set for next test
-$step->set_result(q{});
-
-$conf->replenish($serialized);
-
-########## ask; maintainer ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer} ],
- mode => q{configure},
- }
-);
- at prompts = q{flex};
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf)}, \$stdout);
- my $possible_results = qr/^(
- no\slex\sprogram\swas\sfound
- | lex\sprogram\sdoes\snot\sexist\sor\sdoes\snot\sunderstand\s--version
- | could\snot\sunderstand\sflex\sversion\srequirement
- | found\sflex\sversion.*?but\sat\sleast.*?is\srequired
- | flex
- )/x;
- my @dump_msg = ( Dumper( $step->result() ) =~ /'(.*?)'/ );
- like( $step->result(), $possible_results,
- "Response to prompt led to acceptable result: " . $dump_msg[0] );
- if ( $dump_msg[0] eq q{no lex program was found} ) {
- ok( !$stdout, "No lex program => no prompts" );
- }
- else {
- ok( $stdout, "prompts were captured" );
- }
-}
-$object = undef;
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_lex-01.t - test inter::lex
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_lex-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::lex.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::lex, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_lex-02.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_lex-02.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,78 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_lex-02.t
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-$ENV{TEST_LEX} = 'foobar';
-use_ok('config::inter::lex');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## ask; maintainer; $ENV{TEST_LEX} ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{inter::lex};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my $ret = $step->runstep($conf);
-is( $ret, undef, "runstep() returned undefined value" );
-my $result_expected = q{no lex program was found};
-is( $step->result(), $result_expected, "Result was $result_expected" );
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_lex-02.t - test inter::lex
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_lex-02.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::lex.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::lex, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_lex-03.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_lex-03.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,108 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_lex-03.t
-
-use strict;
-use warnings;
-use Test::More tests => 14;
-use Carp;
-use Data::Dumper;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::lex');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-use IO::CaptureOutput qw | capture |;
-
-########## ask; maintainer; prompt flex ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer} ],
- mode => q{configure},
- }
-);
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my @prompts = q{flex};
-my $object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-my $pkg = q{inter::lex};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-{
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf)}, \$stdout);
- my $possible_results = qr/^(
- no\slex\sprogram\swas\sfound
- | lex\sprogram\sdoes\snot\sexist\sor\sdoes\snot\sunderstand\s--version
- | could\snot\sunderstand\sflex\sversion\srequirement
- | found\sflex\sversion.*?but\sat\sleast.*?is\srequired
- | flex
- )/x;
- my @dump_msg = ( Dumper( $step->result() ) =~ /'(.*?)'/ );
- like( $step->result(), $possible_results,
- "Response to prompt led to acceptable result: " . $dump_msg[0] );
- if ( $dump_msg[0] eq q{no lex program was found} ) {
- ok( !$stdout, "No lex program => no prompts" );
- }
- else {
- ok( $stdout, "prompts were captured" );
- }
-}
-$object = undef;
-$conf->replenish($serialized);
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_lex-03.t - test inter::lex
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_lex-03.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::lex. In
-this test the C<--ask>, C<--maintainer> and C<--lex=flex> options are
-provided.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::lex, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_libparrot-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_libparrot-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,299 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_libparrot-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 58;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
-use_ok('config::inter::libparrot');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-
-########## no ask; no other options ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install}, $args );
-
-my $pkg = q{inter::libparrot};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-$conf->replenish($serialized);
-
-########## no ask; parrot_is_shared ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--parrot_is_shared} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-$conf->replenish($serialized);
-
-########## no ask; parrot_is_shared; has_dynamic_linking ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--parrot_is_shared} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $has_dynamic_linking_orig = $conf->data->get('has_dynamic_linking');
-$conf->data->set('has_dynamic_linking' => 1);
-
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-is($step->result(), 'yes', "Expected result was set");
-# re-set for next test
-$step->set_result(q{});
-$conf->data->set('has_dynamic_linking' => $has_dynamic_linking_orig);
-
-$conf->replenish($serialized);
-
-########## no ask; parrot_is_shared; has_dynamic_linking; rpath ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--parrot_is_shared} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('has_dynamic_linking' => 1);
-my $rpath_orig = $conf->data->get('rpath');
-$conf->data->set('rpath' => q{-L});
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-is($step->result(), 'yes', "Expected result was set");
-# re-set for next test
-$step->set_result(q{});
-$conf->data->set('has_dynamic_linking' => $has_dynamic_linking_orig);
-$conf->data->set('rpath' => $rpath_orig);
-
-$conf->replenish($serialized);
-
-########## no ask; parrot_is_shared; has_dynamic_linking; rpath ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--parrot_is_shared} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('has_dynamic_linking' => 1);
-$rpath_orig = $conf->data->get('rpath');
-$conf->data->set('rpath' => q{-L});
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-is($step->result(), 'yes', "Expected result was set");
-# re-set for next test
-$step->set_result(q{});
-$conf->data->set('has_dynamic_linking' => $has_dynamic_linking_orig);
-$conf->data->set('rpath' => $rpath_orig);
-
-$conf->replenish($serialized);
-
-########## no ask; libparrot_ldflags ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my $libparrot_ldflags_orig = $conf->data->get('libparrot_ldflags');
-$conf->data->set('libparrot_ldflags' => 'libparrot.lib');
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-$conf->data->set('libparrot_ldflags' => $libparrot_ldflags_orig);
-
-$conf->replenish($serialized);
-
-########## ask; no has_dynamic_linking ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('has_dynamic_linking' => 0);
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-is($step->result(), 'no', "Expected result was set");
-# re-set for next test
-$step->set_result(q{});
-$conf->data->set('has_dynamic_linking' => $has_dynamic_linking_orig);
-
-$conf->replenish($serialized);
-
-########## ask; parrot_is_shared; has_dynamic_linking ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--parrot_is_shared} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('has_dynamic_linking' => 1);
-
-my ( @prompts, $prompt, $object );
-
-$prompt = q{y};
-push @prompts, $prompt;
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-undef $object;
-untie *STDIN;
-is($step->result(), 'yes', "Expected result was set");
-# re-set for next test
-$step->set_result(q{});
-$conf->data->set('has_dynamic_linking' => $has_dynamic_linking_orig);
- at prompts = ();
-
-$conf->replenish($serialized);
-
-########## ask; has_dynamic_linking ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$conf->data->set('has_dynamic_linking' => 1);
-$prompt = q{n};
-push @prompts, $prompt;
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-undef $object;
-untie *STDIN;
-is($step->result(), 'no', "Expected result was set");
-# re-set for next test
-$step->set_result(q{});
-$conf->data->set('has_dynamic_linking' => $has_dynamic_linking_orig);
- at prompts = ();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_libparrot-01.t - test inter::libparrot
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_libparrot-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::libparrot.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::libparrot, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_make-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_make-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,123 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_make-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 18;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::make');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-
-########## ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{inter::make};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my ( @prompts, $object );
- at prompts = (q{make});
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-my $ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-
-$object = undef;
-untie *STDIN;
-
-$conf->replenish($serialized);
-
-########## ask ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-$conf->data->set('gmake_version' => '4.1');
-my $prog = 'gmake';
-inter::make::_set_make_c($conf, $prog);
-is($conf->data->get('make_c'), 'gmake -C',
- "make_c correctly set when gmake");
-
-$conf->data->set('gmake_version' => undef);
-my $str = q|$(PERL) -e 'chdir shift @ARGV; system q{$(MAKE)}, @ARGV; exit $$? >> 8;'|;
-$conf->data->set(make_c => $str);
-$prog = 'make';
-inter::make::_set_make_c($conf, $prog);
-is($conf->data->get('make_c'),
- q|$(PERL) -e 'chdir shift @ARGV; system q{make}, @ARGV; exit $$? >> 8;'|,
- "make_c correctly set when gmake");
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_make-01.t - test inter::make
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_make-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::make.
-
-B<Note:> Since F<inter::make> probes for the F<make> program
-found on a particular OS, it will probably be difficult to achieve high
-branch or condition coverage. The module is likely to discover a
-F<make> program long before it reaches the point where it must prompt
-the user for a response.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::make, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_progs-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_progs-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,130 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_progs-01.t
-
-use strict;
-use warnings;
-
-use Test::More tests => 24;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
-use_ok('config::init::hints');
-use_ok('config::inter::progs');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-use IO::CaptureOutput qw| capture |;
-
-=for hints_for_testing Testing and refactoring of inter::progs should
-entail understanding of issues discussed in the following RT tickets:
-http://rt.perl.org/rt3/Ticket/Display.html?id=43174; and
-http://rt.perl.org/rt3/Ticket/Display.html?id=41168.
-
-=cut
-
-########## ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install}, $args );
-test_step_thru_runstep( $conf, q{init::hints}, $args );
-
-my $pkg = q{inter::progs};
-
-$conf->add_steps($pkg);
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my @prompts;
-my $object;
-my ($stdout, $debug, $debug_validity);
-
-foreach my $p (
- qw|
- cc
- link
- ld
- ccflags
- linkflags
- ldflags
- libs
- cxx
- |
- )
-{
- push @prompts, $conf->data->get($p);
-}
-push @prompts, q{y};
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-capture( sub {
- my $verbose = inter::progs::_get_verbose($conf);
- my $ask = inter::progs::_prepare_for_interactivity($conf);
- my $cc;
- ($conf, $cc) = inter::progs::_get_programs($conf, $verbose, $ask);
- $debug = inter::progs::_get_debug($conf, $ask);
- $debug_validity = inter::progs::_is_debug_setting_valid($debug);
-}, \$stdout);
-ok( defined $debug_validity, "'debug_validity' set as expected" );
-
-capture( sub {
- $conf = inter::progs::_set_debug_and_warn($conf, $debug);
-}, \$stdout);
-ok( defined $conf, "Components of runstep() tested okay" );
-
-$object = undef;
-untie *STDIN;
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_progs-01.t - test inter::progs
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_progs-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::progs.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::progs, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_progs-02.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_progs-02.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,130 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_progs-02.t
-
-use strict;
-use warnings;
-
-use Test::More tests => 24;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
-use_ok('config::init::hints');
-use_ok('config::inter::progs');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-use IO::CaptureOutput qw| capture |;
-
-=for hints_for_testing Testing and refactoring of inter::progs should
-entail understanding of issues discussed in the following RT tickets:
-http://rt.perl.org/rt3/Ticket/Display.html?id=43174; and
-http://rt.perl.org/rt3/Ticket/Display.html?id=41168.
-
-=cut
-
-########## ask; debugging 0 ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--debugging=0} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install}, $args );
-test_step_thru_runstep( $conf, q{init::hints}, $args );
-
-my $pkg = q{inter::progs};
-
-$conf->add_steps($pkg);
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my @prompts;
-my $object;
-my ($stdout, $debug, $debug_validity);
-
-foreach my $p (
- qw|
- cc
- link
- ld
- ccflags
- linkflags
- ldflags
- libs
- cxx
- |
- )
-{
- push @prompts, $conf->data->get($p);
-}
-push @prompts, q{y};
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-capture( sub {
- my $verbose = inter::progs::_get_verbose($conf);
- my $ask = inter::progs::_prepare_for_interactivity($conf);
- my $cc;
- ($conf, $cc) = inter::progs::_get_programs($conf, $verbose, $ask);
- $debug = inter::progs::_get_debug($conf, $ask);
- $debug_validity = inter::progs::_is_debug_setting_valid($debug);
-}, \$stdout);
-ok( defined $debug_validity, "'debug_validity' set as expected" );
-
-capture( sub {
- $conf = inter::progs::_set_debug_and_warn($conf, $debug);
-}, \$stdout);
-ok( defined $conf, "Components of runstep() tested okay" );
-
-$object = undef;
-untie *STDIN;
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_progs-02.t - test inter::progs
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_progs-02.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::progs.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::progs, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_progs-03.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_progs-03.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,130 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_progs-03.t
-
-use strict;
-use warnings;
-
-use Test::More tests => 24;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
-use_ok('config::init::hints');
-use_ok('config::inter::progs');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-use IO::CaptureOutput qw| capture |;
-
-=for hints_for_testing Testing and refactoring of inter::progs should
-entail understanding of issues discussed in the following RT tickets:
-http://rt.perl.org/rt3/Ticket/Display.html?id=43174; and
-http://rt.perl.org/rt3/Ticket/Display.html?id=41168.
-
-=cut
-
-########### ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install}, $args );
-test_step_thru_runstep( $conf, q{init::hints}, $args );
-
-my $pkg = q{inter::progs};
-
-$conf->add_steps($pkg);
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my @prompts;
-my $object;
-my ($stdout, $debug, $debug_validity);
-
-foreach my $p (
- qw|
- cc
- link
- ld
- ccflags
- linkflags
- ldflags
- libs
- cxx
- |
- )
-{
- push @prompts, $conf->data->get($p);
-}
-push @prompts, q{n};
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-capture( sub {
- my $verbose = inter::progs::_get_verbose($conf);
- my $ask = inter::progs::_prepare_for_interactivity($conf);
- my $cc;
- ($conf, $cc) = inter::progs::_get_programs($conf, $verbose, $ask);
- $debug = inter::progs::_get_debug($conf, $ask);
- $debug_validity = inter::progs::_is_debug_setting_valid($debug);
-}, \$stdout);
-ok( defined $debug_validity, "'debug_validity' set as expected" );
-
-capture( sub {
- $conf = inter::progs::_set_debug_and_warn($conf, $debug);
-}, \$stdout);
-ok( defined $conf, "Components of runstep() tested okay" );
-
-$object = undef;
-untie *STDIN;
-
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_progs-03.t - test inter::progs
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_progs-03.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::progs.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::progs, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_progs-04.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_progs-04.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,121 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_progs-04.t
-
-use strict;
-use warnings;
-
-use Test::More tests => 23;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::init::install');
-use_ok('config::init::hints');
-use_ok('config::inter::progs');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-use IO::CaptureOutput qw| capture |;
-
-=for hints_for_testing Testing and refactoring of inter::progs should
-entail understanding of issues discussed in the following RT tickets:
-http://rt.perl.org/rt3/Ticket/Display.html?id=43174; and
-http://rt.perl.org/rt3/Ticket/Display.html?id=41168.
-
-=cut
-
-########## ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-test_step_thru_runstep( $conf, q{init::install}, $args );
-test_step_thru_runstep( $conf, q{init::hints}, $args );
-
-my $pkg = q{inter::progs};
-
-$conf->add_steps($pkg);
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my @prompts;
-my $object;
-my ($stdout, $debug, $debug_validity);
-
-foreach my $p (
- qw|
- cc
- link
- ld
- ccflags
- linkflags
- ldflags
- libs
- cxx
- |
- )
-{
- push @prompts, $conf->data->get($p);
-}
-push @prompts, q{0};
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-my $rv;
-capture( sub {
- $rv = $step->runstep($conf);
-}, \$stdout);
-ok( ! defined $rv, "runstep returned undef as expected" );
-
-$object = undef;
-untie *STDIN;
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_progs-04.t - test inter::progs
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_progs-04.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::progs.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::progs, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_shlibs-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_shlibs-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,126 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_shlibs-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 21;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::shlibs');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-
-########## ask; mock response to prompt ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{inter::shlibs};
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-
-my ( @prompts, $prompt, $object );
-$prompt = q{foobar};
-push @prompts, $prompt;
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
- is( $step->result(), $prompt, "Expected result was set" );
-}
-
-undef $object;
-untie *STDIN;
- at prompts = ();
-
-$conf->replenish($serialized);
-
-########## ask; empty response to prompt ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$prompt = q{ };
-push @prompts, $prompt;
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
- is( $step->result(), q{done}, "Expected result was set" );
-}
-
-undef $object;
-untie *STDIN;
- at prompts = ();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_shlibs-01.t - test inter::shlibs
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_shlibs-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::shlibs.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::shlibs, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_types-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_types-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,110 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_types-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::inter::types');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-
-########## no ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new;
-
-my $pkg = q{inter::types};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( $ret, "runstep() returned true value" );
-
-$conf->replenish($serialized);
-
-########## ask ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-
-my ( @prompts, $object );
-
-$conf->options->set('intval' => 'alpha');
-$conf->options->set('floatval' => 'beta');
-$conf->options->set('opcode' => 'gamma');
- at prompts = qw( delta epsilon zeta );
-
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-
-{
- open STDOUT, '>', "/dev/null" or croak "Unable to open to myout";
- my $ret = $step->runstep($conf);
- close STDOUT or croak "Unable to close after myout";
- ok( $ret, "runstep() returned true value" );
-}
-
-undef $object;
-untie *STDIN;
- at prompts = ();
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_types-01.t - test inter::types
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_types-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::types.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::types, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_yacc-01.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_yacc-01.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,177 +0,0 @@
-#! perl
-# Copyright (C) 2007-2008, Parrot Foundation.
-# $Id$
-# inter_yacc-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 31;
-use Carp;
-use Data::Dumper;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-use_ok('config::inter::yacc');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-use Tie::Filehandle::Preempt::Stdin;
-use IO::CaptureOutput qw | capture |;
-
-########## ask ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [q{--ask}],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{inter::yacc};
-
-$conf->add_steps($pkg);
-
-my $serialized = $conf->pcfreeze();
-
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-is( $step->result(), q{skipped},
- "Step was skipped as expected; no '--maintainer' option" );
-# re-set for next step
-$step->set_result(q{});
-
-$conf->replenish($serialized);
-
-########## ask; maintainer; $ENV{YACC} ##########
-
-$ENV{YACC} = 'foobar';
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-$ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-my $result_expected = q{user defined};
-is( $step->result(), $result_expected,
- "Result was $result_expected because environment variable was set" );
-# re-set for next step
-delete $ENV{YACC};
-$step->set_result('');
-
-$conf->replenish($serialized);
-
-########## ask; maintainer; yacc=bison ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer}, q{--yacc=bison} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
-my ( @prompts, $object );
- at prompts = map { q{foo_} . $_ } qw| alpha |;
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-$ret = $step->runstep($conf);
-ok( defined $ret, "runstep() returned defined value" );
-$result_expected = q{user defined};
-is( $step->result(), $result_expected, "Result was $result_expected" );
-$object = undef;
-untie *STDIN;
-# re-set for next step
-$step->set_result(q{});
- at prompts = ();
-
-$conf->replenish($serialized);
-
-########## ask; maintainer; ##########
-
-($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer} ],
- mode => q{configure},
- }
-);
-$conf->options->set( %{$args} );
-$step = test_step_constructor_and_description($conf);
- at prompts = q{bison};
-$object = tie *STDIN, 'Tie::Filehandle::Preempt::Stdin', @prompts;
-can_ok( 'Tie::Filehandle::Preempt::Stdin', ('READLINE') );
-isa_ok( $object, 'Tie::Filehandle::Preempt::Stdin' );
-{
- my $rv;
- my $stdout;
- capture ( sub {$rv = $step->runstep($conf)}, \$stdout);
- my $possible_results = qr/^(
- no\syacc\sprogram\swas\sfound
- | yacc\sprogram\sdoes\snot\sexist\sor\sdoes\snot\sunderstand\s--version
- | could\snot\sunderstand\sbison\sversion\srequirement
- | found\sbison\sversion.*?but\sat\sleast.*?is\srequired
- | bison
- )/x;
- my @dump_msg = ( Dumper( $step->result() ) =~ /'(.*?)'/ );
- like( $step->result(), $possible_results,
- "Response to prompt led to acceptable result: " . $dump_msg[0] );
- if ( $dump_msg[0] eq q{no yacc program was found} ) {
- ok( !$stdout, "No yacc program => no prompts" );
- }
- else {
- ok( $stdout, "prompts were captured" );
- }
-}
-$object = undef;
-untie *STDIN;
-# re-set for next step
-$step->set_result(q{});
- at prompts = ();
-
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_yacc-01.t - test inter::yacc
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_yacc-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::yacc.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::yacc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Deleted: branches/tt761_keys_revamp/t/steps/inter_yacc-02.t
==============================================================================
--- branches/tt761_keys_revamp/t/steps/inter_yacc-02.t Fri Jul 10 22:11:09 2009 (r39980)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,79 +0,0 @@
-#! perl
-# Copyright (C) 2007, Parrot Foundation.
-# $Id$
-# inter_yacc-02.t
-
-use strict;
-use warnings;
-use Test::More tests => 12;
-use Carp;
-use lib qw( lib t/configure/testlib );
-use_ok('config::init::defaults');
-$ENV{TEST_YACC} = 'foobar';
-use_ok('config::inter::yacc');
-use Parrot::Configure;
-use Parrot::Configure::Options qw( process_options );
-use Parrot::Configure::Test qw(
- test_step_thru_runstep
- test_step_constructor_and_description
-);
-
-########## ask; maintainer; $ENV{TEST_YACC} ##########
-
-my ($args, $step_list_ref) = process_options(
- {
- argv => [ q{--ask}, q{--maintainer} ],
- mode => q{configure},
- }
-);
-
-my $conf = Parrot::Configure->new();
-
-test_step_thru_runstep( $conf, q{init::defaults}, $args );
-
-my $pkg = q{inter::yacc};
-
-$conf->add_steps($pkg);
-$conf->options->set( %{$args} );
-my $step = test_step_constructor_and_description($conf);
-my $ret = $step->runstep($conf);
-is( $ret, undef, "runstep() returned undefined value" );
-my $result_expected = q{no yacc program was found};
-is( $step->result(), $result_expected, "Result was $result_expected" );
-# re-set for next step
-$step->set_result(q{});
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-inter_yacc-02.t - test inter::yacc
-
-=head1 SYNOPSIS
-
- % prove t/steps/inter_yacc-02.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test inter::yacc.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::inter::yacc, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Modified: branches/tt761_keys_revamp/t/tools/install/01-create_directories.t
==============================================================================
--- branches/tt761_keys_revamp/t/tools/install/01-create_directories.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/tools/install/01-create_directories.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -34,7 +34,7 @@
$tdir .= '/';
my @dirs = qw(foo/bar foo/bar/baz);
- my @created = mkpath( "$tdir$dirs[0]" );
+ my @created = mkpath( [ "$tdir$dirs[0]" ], 0, 0777 );
ok( ( -d $created[0] ),
"one directory created before create_directories() is called" );
@@ -52,7 +52,7 @@
$tdir .= '/';
my @dirs = qw(foo/bar foo/bar/baz);
- my @created = mkpath( $tdir . 'foo' );
+ my @created = mkpath( [ $tdir . 'foo' ], 0, 0777 );
ok( ( -d $created[0] ),
"one directory created before create_directories() is called" );
Modified: branches/tt761_keys_revamp/t/tools/install/dev_overall.t
==============================================================================
--- branches/tt761_keys_revamp/t/tools/install/dev_overall.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/tools/install/dev_overall.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -115,9 +115,11 @@
runtime/parrot/library
src/pmc
);
- my @created =
- mkpath( ( map { File::Spec->catdir( $builddir, $_ ) } @dirs_needed ),
- { mode => 0777} );
+ my @created = mkpath(
+ [ map { File::Spec->catdir( $builddir, $_ ) } @dirs_needed ],
+ 0,
+ 0777
+ );
print STDERR "dirs created: @created\n" if $DEBUG;
foreach my $f ( keys %testfiles ) {
my $src = File::Spec->catfile( $cwd, $testlibdir, $f );
Modified: branches/tt761_keys_revamp/t/tools/install/overall.t
==============================================================================
--- branches/tt761_keys_revamp/t/tools/install/overall.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/tools/install/overall.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -100,9 +100,11 @@
runtime/parrot/include
compilers/pge
);
- my @created =
- mkpath( ( map { File::Spec->catdir( $builddir, $_ ) } @dirs_needed ),
- { mode => 0777 } );
+ my @created = mkpath(
+ [ map { File::Spec->catdir( $builddir, $_ ) } @dirs_needed ],
+ 0,
+ 0777
+ );
print STDERR "dirs created: @created\n" if $DEBUG;
foreach my $f ( keys %testfiles ) {
my $src = File::Spec->catfile( $cwd, $testlibdir, $f );
Modified: branches/tt761_keys_revamp/t/tools/ops2cutils/06-dynamic.t
==============================================================================
--- branches/tt761_keys_revamp/t/tools/ops2cutils/06-dynamic.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/tools/ops2cutils/06-dynamic.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -34,7 +34,7 @@
|;
use IO::CaptureOutput qw | capture |;
-my @dynopsfiles = qw( src/dynoplibs/myops.ops );
+my @dynopsfiles = qw( src/dynoplibs/obscure.ops );
ok( chdir $main::topdir, "Positioned at top-level Parrot directory" );
my $cwd = cwd();
@@ -55,16 +55,16 @@
}
chdir "src/dynoplibs" or croak "Unable to change to src/dynoplibs: $!";
- test_dynops( [qw( CGoto myops.ops )] );
- test_dynops( [qw( CGP myops.ops )] );
- test_dynops( [qw( C myops.ops )] );
- test_dynops( [qw( CSwitch myops.ops )] );
+ test_dynops( [qw( CGoto obscure.ops )] );
+ test_dynops( [qw( CGP obscure.ops )] );
+ test_dynops( [qw( C obscure.ops )] );
+ test_dynops( [qw( CSwitch obscure.ops )] );
{
my ($self, $stdout, $stderr);
capture(
sub { $self = Parrot::Ops2c::Utils->new( {
- argv => [qw( CSwitch myops.ops myops.ops )],
+ argv => [qw( CSwitch obscure.ops obscure.ops )],
flag => { dynamic => 1 },
} ); },
\$stdout,
@@ -73,7 +73,7 @@
ok( defined $self,
"Constructor correctly returned when provided >= 1 arguments" );
like( $stderr,
- qr/Ops file 'myops\.ops' mentioned more than once!/, "Error message is correct" );
+ qr/Ops file 'obscure\.ops' mentioned more than once!/, "Error message is correct" );
my $c_header_file = $self->print_c_header_file();
ok( -e $c_header_file, "$c_header_file created" );
Modified: branches/tt761_keys_revamp/t/tools/ops2cutils/09-dynamic_nolines.t
==============================================================================
--- branches/tt761_keys_revamp/t/tools/ops2cutils/09-dynamic_nolines.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/tools/ops2cutils/09-dynamic_nolines.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -32,7 +32,7 @@
$num
$skip
|;
-my @dynopsfiles = qw( src/dynoplibs/myops.ops );
+my @dynopsfiles = qw( src/dynoplibs/obscure.ops );
ok( chdir $main::topdir, "Positioned at top-level Parrot directory" );
my $cwd = cwd();
@@ -52,10 +52,10 @@
}
chdir "src/dynoplibs" or croak "Unable to change to src/dynoplibs: $!";
- test_dynops_nolines( [qw( CGoto myops.ops )] );
- test_dynops_nolines( [qw( CGP myops.ops )] );
- test_dynops_nolines( [qw( C myops.ops )] );
- test_dynops_nolines( [qw( CSwitch myops.ops )] );
+ test_dynops_nolines( [qw( CGoto obscure.ops )] );
+ test_dynops_nolines( [qw( CGP obscure.ops )] );
+ test_dynops_nolines( [qw( C obscure.ops )] );
+ test_dynops_nolines( [qw( CSwitch obscure.ops )] );
ok( chdir($cwd), "returned to starting directory" );
}
Modified: branches/tt761_keys_revamp/t/tools/ops2pm/05-renum_op_map_file.t
==============================================================================
--- branches/tt761_keys_revamp/t/tools/ops2pm/05-renum_op_map_file.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/tools/ops2pm/05-renum_op_map_file.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -32,7 +32,7 @@
my $tdir = tempdir( CLEANUP => 1 );
chdir $tdir or croak "Unable to change to testing directory: $!";
my $opsdir = File::Spec->catdir ( $tdir, 'src', 'ops' );
- mkpath( $opsdir, { mode => 0755 } ) or croak "Unable to make testing directory";
+ mkpath( [ $opsdir ], 0, 0755 ) or croak "Unable to make testing directory";
##### Stage 1: Generate ops.num de novo #####
Modified: branches/tt761_keys_revamp/t/tools/ops2pm/10-print_module.t
==============================================================================
--- branches/tt761_keys_revamp/t/tools/ops2pm/10-print_module.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/tools/ops2pm/10-print_module.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -188,7 +188,7 @@
Directory failure: can it be provoked?
if ( !-d $fulldir ) {
- File::Path::mkpath( $fulldir, { mode => 0755 } )
+ File::Path::mkpath( [ $fulldir ], 0, 0755 )
or die "$self->{script}: Could not mkdir $fulldir: $!!\n";
}
Modified: branches/tt761_keys_revamp/t/tools/ops2pm/11-print_h.t
==============================================================================
--- branches/tt761_keys_revamp/t/tools/ops2pm/11-print_h.t Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/t/tools/ops2pm/11-print_h.t Fri Jul 10 22:11:09 2009 (r39981)
@@ -120,7 +120,7 @@
Directory failure: can it be provoked?
if ( !-d $fulldir ) {
- File::Path::mkpath( $fulldir, { mode => 0755 } )
+ File::Path::mkpath( [ $fulldir ], 0, 0755 )
or die "$self->{script}: Could not mkdir $fulldir: $!!\n";
}
Modified: branches/tt761_keys_revamp/tools/dev/create_language.pl
==============================================================================
--- branches/tt761_keys_revamp/tools/dev/create_language.pl Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/tools/dev/create_language.pl Fri Jul 10 22:11:09 2009 (r39981)
@@ -116,7 +116,7 @@
my $filedir = File::Spec->catpath($volume, $dir);
unless (-d $filedir) {
print "creating $filedir\n";
- mkpath($filedir);
+ mkpath( [ $filedir ], 0, 0777 );
}
print "creating $filepath\n";
open $fh, '>', $filepath;
Modified: branches/tt761_keys_revamp/tools/dev/mk_language_shell.pl
==============================================================================
--- branches/tt761_keys_revamp/tools/dev/mk_language_shell.pl Fri Jul 10 21:46:17 2009 (r39980)
+++ branches/tt761_keys_revamp/tools/dev/mk_language_shell.pl Fri Jul 10 22:11:09 2009 (r39981)
@@ -173,7 +173,7 @@
my $filedir = File::Spec->catpath($volume, $dir);
unless (-d $filedir) {
print "creating $filedir\n";
- mkpath($filedir);
+ mkpath( [ $filedir ], 0, 0777 );
}
print "creating $filepath\n";
open $fh, '>', $filepath;
More information about the parrot-commits
mailing list