Hello community, here is the log from the commit of package yast2-testsuite for openSUSE:Factory checked in at 2013-08-01 11:10:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-testsuite (Old) and /work/SRC/openSUSE:Factory/.yast2-testsuite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-testsuite" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-testsuite/yast2-testsuite.changes 2013-07-04 18:07:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-testsuite.new/yast2-testsuite.changes 2013-08-01 11:10:23.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 31 08:43:17 UTC 2013 - [email protected] + +- converted from YCP to Ruby by YCP Killer + (https://github.com/yast/ycp-killer) +- version 3.0.0 + +------------------------------------------------------------------- Old: ---- yast2-testsuite-2.24.4.tar.bz2 New: ---- yast2-testsuite-3.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.lPyJhP/_old 2013-08-01 11:10:24.000000000 +0200 +++ /var/tmp/diff_new_pack.lPyJhP/_new 2013-08-01 11:10:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-testsuite -Version: 2.24.4 +Version: 3.0.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,11 +25,14 @@ BuildRequires: yast2-core-devel BuildRequires: yast2-devtools +BuildRequires: yast2-ruby-bindings >= 1.0.0 BuildRequires: yast2-ycp-ui-bindings Requires: dejagnu Requires: expect # y2base -I includepath -M modulepath Requires: yast2-core >= 2.19.0 +Requires: yast2-ruby-bindings >= 1.0.0 + Summary: YaST2 - Testsuite License: GPL-2.0+ Group: System/YaST ++++++ yast2-testsuite-2.24.4.tar.bz2 -> yast2-testsuite-3.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/Makefile.in new/yast2-testsuite-3.0.0/Makefile.in --- old/yast2-testsuite-2.24.4/Makefile.in 2013-07-02 11:02:11.000000000 +0200 +++ new/yast2-testsuite-3.0.0/Makefile.in 2013-07-31 10:56:27.000000000 +0200 @@ -65,7 +65,7 @@ $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \ config.sub install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/VERSION new/yast2-testsuite-3.0.0/VERSION --- old/yast2-testsuite-2.24.4/VERSION 2013-07-01 10:25:57.000000000 +0200 +++ new/yast2-testsuite-3.0.0/VERSION 2013-07-30 14:05:06.000000000 +0200 @@ -1 +1 @@ -2.24.4 +3.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/autodocs-ycp.ami new/yast2-testsuite-3.0.0/autodocs-ycp.ami --- old/yast2-testsuite-2.24.4/autodocs-ycp.ami 2013-07-02 11:02:06.000000000 +0200 +++ new/yast2-testsuite-3.0.0/autodocs-ycp.ami 2013-07-31 10:56:22.000000000 +0200 @@ -8,6 +8,8 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_RB: Files that the ruby autodocs is built from (using yard) +# Optional - the default is $(srcdir)/../../src/modules/*.rb) $(srcdir)/../../src/include/*/*.rb # AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs # Optional - the default is no subdir, $(docdir)/autodocs # AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ @@ -15,18 +17,31 @@ htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) -CLEANFILES = $(html_DATA) pod2htm*.tmp +# use nobase_ prefix to keep the directory structure +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_RB ?= $(wildcard $(srcdir)/../../src/modules/*.rb $(srcdir)/../../src/include/*/*.rb) AUTODOCS_STRIP ?= $(srcdir)/../../src -index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +# yard specific options +YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown + +# yard specific clean +clean-local: + rm -rf js css Yast .yardoc + + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) $(AUTODOCS_RB) #including *.pm, for the index - ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP); fi for i in $(AUTODOCS_PM); do \ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc --title "@RPMNAME@ -- Development Documentation" $(YARD_OPTIONS) $(AUTODOCS_RB); fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/configure new/yast2-testsuite-3.0.0/configure --- old/yast2-testsuite-2.24.4/configure 2013-07-02 11:02:10.000000000 +0200 +++ new/yast2-testsuite-3.0.0/configure 2013-07-31 10:56:26.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-testsuite 2.24.4. +# Generated by GNU Autoconf 2.69 for yast2-testsuite 3.0.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-testsuite' PACKAGE_TARNAME='yast2-testsuite' -PACKAGE_VERSION='2.24.4' -PACKAGE_STRING='yast2-testsuite 2.24.4' +PACKAGE_VERSION='3.0.0' +PACKAGE_STRING='yast2-testsuite 3.0.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-testsuite 2.24.4 to adapt to many kinds of systems. +\`configure' configures yast2-testsuite 3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-testsuite 2.24.4:";; + short | recursive ) echo "Configuration of yast2-testsuite 3.0.0:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-testsuite configure 2.24.4 +yast2-testsuite configure 3.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-testsuite $as_me 2.24.4, which was +It was created by yast2-testsuite $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-testsuite' - VERSION='2.24.4' + VERSION='3.0.0' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.24.4" +VERSION="3.0.0" RPMNAME="yast2-testsuite" MAINTAINER="Martin Vidner <[email protected]>" @@ -3403,7 +3403,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-testsuite $as_me 2.24.4, which was +This file was extended by yast2-testsuite $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3456,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-testsuite config.status 2.24.4 +yast2-testsuite config.status 3.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -4591,7 +4591,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-testsuite $as_me 2.24.4, which was +This file was extended by yast2-testsuite $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4644,7 +4644,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-testsuite config.status 2.24.4 +yast2-testsuite config.status 3.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/configure.ac new/yast2-testsuite-3.0.0/configure.ac --- old/yast2-testsuite-2.24.4/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-testsuite-3.0.0/configure.ac 2013-07-31 10:56:22.000000000 +0200 @@ -0,0 +1,160 @@ +dnl configure.ac for yast2-testsuite +dnl +dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl (edit configure.ac.in or configure.in.in instead) + +AC_INIT(yast2-testsuite, 3.0.0, http://bugs.opensuse.org/, yast2-testsuite) +dnl Check for presence of file 'RPMNAME' +AC_CONFIG_SRCDIR([RPMNAME]) + +dnl Checking host/target/build systems, for make, install etc. +AC_CANONICAL_TARGET +dnl Perform program name transformation +AC_ARG_PROGRAM + +AC_PREFIX_DEFAULT(/usr) + +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) + +dnl Important YaST2 variables +VERSION="3.0.0" +RPMNAME="yast2-testsuite" +MAINTAINER="Martin Vidner <[email protected]>" + +dnl pkgconfig honors lib64 +pkgconfigdir=\${libdir}/pkgconfig +pkgconfigdatadir=\${datadir}/pkgconfig +yast2dir=\${prefix}/share/YaST2 + +ybindir=\${prefix}/lib/YaST2/bin +# FIXME duplicates execcompdir +ystartupdir=\${prefix}/lib/YaST2 +plugindir=\${libdir}/YaST2/plugin +includedir=\${prefix}/include/YaST2 +potdir=\${docdir}/pot + +docdir=\${prefix}/share/doc/packages/$RPMNAME +mandir=\${prefix}/share/man + +execcompdir=\${prefix}/lib/YaST2 +agentdir=${execcompdir}/servers_non_y2 + +ydatadir=${yast2dir}/data +imagedir=${yast2dir}/images +themedir=${yast2dir}/theme +localedir=${yast2dir}/locale +clientdir=${yast2dir}/clients +moduledir=${yast2dir}/modules +yncludedir=${yast2dir}/include +schemadir=${yast2dir}/schema +scrconfdir=${yast2dir}/scrconf +desktopdir=\${prefix}/share/applications/YaST2 + +AC_SUBST(VERSION) +AC_SUBST(RPMNAME) +AC_SUBST(MAINTAINER) + +AC_SUBST(pkgconfigdir) +AC_SUBST(pkgconfigdatadir) + +AC_SUBST(yast2dir) + +AC_SUBST(ybindir) +AC_SUBST(ystartupdir) +AC_SUBST(plugindir) +AC_SUBST(includedir) +AC_SUBST(potdir) +AC_SUBST(execcompdir) + +AC_SUBST(docdir) +AC_SUBST(mandir) + +AC_SUBST(ydatadir) +AC_SUBST(imagedir) +AC_SUBST(themedir) +AC_SUBST(localedir) +AC_SUBST(clientdir) +AC_SUBST(moduledir) +AC_SUBST(yncludedir) +AC_SUBST(schemadir) +AC_SUBST(scrconfdir) +AC_SUBST(agentdir) +AC_SUBST(desktopdir) + +fillupdir_d="/var/adm/fillup-templates" +AC_ARG_WITH(fillupdir, + AS_HELP_STRING([--with-fillupdir=DIR], + [where to place fillup templates (default $fillupdir_d.]), + [ fillupdir="$withval" ], + [ fillupdir="$fillupdir_d" ]) +AC_SUBST(fillupdir) + + + +dnl Checks for programs. +AC_PROG_INSTALL +dnl The YCP interpreter checks whether dependent ybc files are older +dnl so we must preserve their timestamps +INSTALL="${INSTALL} -p" +AC_PROG_LN_S +AC_PROG_MAKE_SET + +dnl pkgconfig +AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) +dnl devtools +dnl ... + +dnl no need for AC_ARG_VAR +AC_PATH_PROG(XGETTEXT, xgettext) +if test -z "$XGETTEXT" ; then + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) +fi + +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` + +dnl producing pkg-config for others? +AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) +AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) + +dbdir=${devtools_yast2dir}/data/docbook +STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl +STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl +STYLESHEET_CSS=${dbdir}/css/yast2docs.css +STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl +STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl +AC_SUBST(STYLESHEET_HTML) +AC_SUBST(STYLESHEET_PDF) +AC_SUBST(STYLESHEET_CSS) +AC_SUBST(STYLESHEET_YDOC) +AC_SUBST(STYLESHEET_YCPDOC) + + +AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir) +if test "$YCPDOC" = "false"; then + AC_MSG_ERROR([ycpdoc is not installed]) +fi +AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir) +if test "$YCPMAKEDEP" = "false"; then + AC_MSG_ERROR([ycpmakedep is not installed]) +fi +AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) +if test "$YCPC" = "false"; then + AC_MSG_ERROR([ycpc is not installed]) +fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) + + +AC_OUTPUT([skel/Makefile.testsuite]) +AC_CONFIG_FILES(Makefile doc/autodocs/Makefile +doc/Makefile +skel/Makefile +src/Makefile +testsuite/Makefile) +AC_OUTPUT + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/configure.in new/yast2-testsuite-3.0.0/configure.in --- old/yast2-testsuite-2.24.4/configure.in 2013-07-02 11:02:06.000000000 +0200 +++ new/yast2-testsuite-3.0.0/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,160 +0,0 @@ -dnl configure.in for yast2-testsuite -dnl -dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- -dnl (edit configure.in.in instead) - -AC_INIT(yast2-testsuite, 2.24.4, http://bugs.opensuse.org/, yast2-testsuite) -dnl Check for presence of file 'RPMNAME' -AC_CONFIG_SRCDIR([RPMNAME]) - -dnl Checking host/target/build systems, for make, install etc. -AC_CANONICAL_TARGET -dnl Perform program name transformation -AC_ARG_PROGRAM - -AC_PREFIX_DEFAULT(/usr) - -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) - -dnl Important YaST2 variables -VERSION="2.24.4" -RPMNAME="yast2-testsuite" -MAINTAINER="Martin Vidner <[email protected]>" - -dnl pkgconfig honors lib64 -pkgconfigdir=\${libdir}/pkgconfig -pkgconfigdatadir=\${datadir}/pkgconfig -yast2dir=\${prefix}/share/YaST2 - -ybindir=\${prefix}/lib/YaST2/bin -# FIXME duplicates execcompdir -ystartupdir=\${prefix}/lib/YaST2 -plugindir=\${libdir}/YaST2/plugin -includedir=\${prefix}/include/YaST2 -potdir=\${docdir}/pot - -docdir=\${prefix}/share/doc/packages/$RPMNAME -mandir=\${prefix}/share/man - -execcompdir=\${prefix}/lib/YaST2 -agentdir=${execcompdir}/servers_non_y2 - -ydatadir=${yast2dir}/data -imagedir=${yast2dir}/images -themedir=${yast2dir}/theme -localedir=${yast2dir}/locale -clientdir=${yast2dir}/clients -moduledir=${yast2dir}/modules -yncludedir=${yast2dir}/include -schemadir=${yast2dir}/schema -scrconfdir=${yast2dir}/scrconf -desktopdir=\${prefix}/share/applications/YaST2 - -AC_SUBST(VERSION) -AC_SUBST(RPMNAME) -AC_SUBST(MAINTAINER) - -AC_SUBST(pkgconfigdir) -AC_SUBST(pkgconfigdatadir) - -AC_SUBST(yast2dir) - -AC_SUBST(ybindir) -AC_SUBST(ystartupdir) -AC_SUBST(plugindir) -AC_SUBST(includedir) -AC_SUBST(potdir) -AC_SUBST(execcompdir) - -AC_SUBST(docdir) -AC_SUBST(mandir) - -AC_SUBST(ydatadir) -AC_SUBST(imagedir) -AC_SUBST(themedir) -AC_SUBST(localedir) -AC_SUBST(clientdir) -AC_SUBST(moduledir) -AC_SUBST(yncludedir) -AC_SUBST(schemadir) -AC_SUBST(scrconfdir) -AC_SUBST(agentdir) -AC_SUBST(desktopdir) - -fillupdir_d="/var/adm/fillup-templates" -AC_ARG_WITH(fillupdir, - AS_HELP_STRING([--with-fillupdir=DIR], - [where to place fillup templates (default $fillupdir_d.]), - [ fillupdir="$withval" ], - [ fillupdir="$fillupdir_d" ]) -AC_SUBST(fillupdir) - - - -dnl Checks for programs. -AC_PROG_INSTALL -dnl The YCP interpreter checks whether dependent ybc files are older -dnl so we must preserve their timestamps -INSTALL="${INSTALL} -p" -AC_PROG_LN_S -AC_PROG_MAKE_SET - -dnl pkgconfig -AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) -dnl devtools -dnl ... - -dnl no need for AC_ARG_VAR -AC_PATH_PROG(XGETTEXT, xgettext) -if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) -fi - -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` - -dnl producing pkg-config for others? -AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) -AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) - -dbdir=${devtools_yast2dir}/data/docbook -STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl -STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl -STYLESHEET_CSS=${dbdir}/css/yast2docs.css -STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl -STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl -AC_SUBST(STYLESHEET_HTML) -AC_SUBST(STYLESHEET_PDF) -AC_SUBST(STYLESHEET_CSS) -AC_SUBST(STYLESHEET_YDOC) -AC_SUBST(STYLESHEET_YCPDOC) - - -AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir) -if test "$YCPDOC" = "false"; then - AC_MSG_ERROR([ycpdoc is not installed]) -fi -AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir) -if test "$YCPMAKEDEP" = "false"; then - AC_MSG_ERROR([ycpmakedep is not installed]) -fi -AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) -if test "$YCPC" = "false"; then - AC_MSG_ERROR([ycpc is not installed]) -fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) - - -AC_OUTPUT([skel/Makefile.testsuite]) -AC_CONFIG_FILES(Makefile doc/autodocs/Makefile -doc/Makefile -skel/Makefile -src/Makefile -testsuite/Makefile) -AC_OUTPUT - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/doc/Makefile.in new/yast2-testsuite-3.0.0/doc/Makefile.in --- old/yast2-testsuite-2.24.4/doc/Makefile.in 2013-07-02 11:02:11.000000000 +0200 +++ new/yast2-testsuite-3.0.0/doc/Makefile.in 2013-07-31 10:56:27.000000000 +0200 @@ -56,7 +56,7 @@ subdir = doc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/doc/autodocs/Makefile.in new/yast2-testsuite-3.0.0/doc/autodocs/Makefile.in --- old/yast2-testsuite-2.24.4/doc/autodocs/Makefile.in 2013-07-02 11:02:11.000000000 +0200 +++ new/yast2-testsuite-3.0.0/doc/autodocs/Makefile.in 2013-07-31 10:56:27.000000000 +0200 @@ -26,6 +26,8 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_RB: Files that the ruby autodocs is built from (using yard) +# Optional - the default is $(srcdir)/../../src/modules/*.rb) $(srcdir)/../../src/include/*/*.rb # AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs # Optional - the default is no subdir, $(docdir)/autodocs # AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ @@ -72,7 +74,7 @@ $(top_srcdir)/autodocs-ycp.ami subdir = doc/autodocs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -113,7 +115,7 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(htmldir)" -DATA = $(html_DATA) +DATA = $(nobase_html_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -232,8 +234,10 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) -CLEANFILES = $(html_DATA) pod2htm*.tmp + +# use nobase_ prefix to keep the directory structure +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp all: all-am .SUFFIXES: @@ -268,26 +272,29 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-htmlDATA: $(html_DATA) +install-nobase_htmlDATA: $(nobase_html_DATA) @$(NORMAL_INSTALL) - @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ + @list='$(nobase_html_DATA)'; test -n "$(htmldir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + $(am__nobase_list) | while read dir files; do \ + xfiles=; for file in $$files; do \ + if test -f "$$file"; then xfiles="$$xfiles $$file"; \ + else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ + test -z "$$xfiles" || { \ + test "x$$dir" = x. || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$dir"; }; \ + echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(htmldir)/$$dir'"; \ + $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(htmldir)/$$dir" || exit $$?; }; \ done -uninstall-htmlDATA: +uninstall-nobase_htmlDATA: @$(NORMAL_UNINSTALL) - @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + @list='$(nobase_html_DATA)'; test -n "$(htmldir)" || list=; \ + $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -368,7 +375,7 @@ @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic mostlyclean-am +clean-am: clean-generic clean-local mostlyclean-am distclean: distclean-am -rm -f Makefile @@ -386,7 +393,7 @@ info-am: -install-data-am: install-htmlDATA +install-data-am: install-nobase_htmlDATA install-dvi: install-dvi-am @@ -430,34 +437,46 @@ ps-am: -uninstall-am: uninstall-htmlDATA +uninstall-am: uninstall-nobase_htmlDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-htmlDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-htmlDATA +.PHONY: all all-am check check-am clean clean-generic clean-local \ + distclean distclean-generic distdir dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-nobase_htmlDATA install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-nobase_htmlDATA AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_RB ?= $(wildcard $(srcdir)/../../src/modules/*.rb $(srcdir)/../../src/include/*/*.rb) AUTODOCS_STRIP ?= $(srcdir)/../../src -index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +# yard specific options +YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown + +# yard specific clean +clean-local: + rm -rf js css Yast .yardoc + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) $(AUTODOCS_RB) #including *.pm, for the index - ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP); fi for i in $(AUTODOCS_PM); do \ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc --title "@RPMNAME@ -- Development Documentation" $(YARD_OPTIONS) $(AUTODOCS_RB); fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/skel/Makefile.in new/yast2-testsuite-3.0.0/skel/Makefile.in --- old/yast2-testsuite-2.24.4/skel/Makefile.in 2013-07-02 11:02:11.000000000 +0200 +++ new/yast2-testsuite-3.0.0/skel/Makefile.in 2013-07-31 10:56:27.000000000 +0200 @@ -58,7 +58,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.testsuite.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/skel/Makefile_am new/yast2-testsuite-3.0.0/skel/Makefile_am --- old/yast2-testsuite-2.24.4/skel/Makefile_am 2013-01-22 12:19:28.000000000 +0100 +++ new/yast2-testsuite-3.0.0/skel/Makefile_am 2013-07-30 14:05:06.000000000 +0200 @@ -5,7 +5,7 @@ # AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.rb) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/src/Makefile.am new/yast2-testsuite-3.0.0/src/Makefile.am --- old/yast2-testsuite-2.24.4/src/Makefile.am 2013-05-14 20:06:36.000000000 +0200 +++ new/yast2-testsuite-3.0.0/src/Makefile.am 2013-07-30 14:05:06.000000000 +0200 @@ -1,15 +1,11 @@ -# -# Makefile.am for testsuite/src -# -# $Id$ -# +# Sources for testsuite -ynclude_DATA = \ - testsuite.ycp +module_DATA = \ + modules/Testsuite.rb -module_DATA = \ - Testsuite.ycp +ynclude_DATA = \ + include/testsuite.rb -EXTRA_DIST = $(ynclude_DATA) $(module_DATA) +EXTRA_DIST = $(module_DATA) $(ynclude_DATA) -include $(top_srcdir)/Makefile.am.common +include $(top_srcdir)/Makefile.am.common \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/src/Makefile.in new/yast2-testsuite-3.0.0/src/Makefile.in --- old/yast2-testsuite-2.24.4/src/Makefile.in 2013-07-02 11:02:11.000000000 +0200 +++ new/yast2-testsuite-3.0.0/src/Makefile.in 2013-07-31 10:56:27.000000000 +0200 @@ -14,11 +14,7 @@ @SET_MAKE@ -# -# Makefile.am for testsuite/src -# -# $Id$ -# +# Sources for testsuite # Makefile.am.common -*- Makefile -*- # Generated file, do not edit! @@ -64,7 +60,7 @@ $(top_srcdir)/Makefile.am.common subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -225,13 +221,13 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -ynclude_DATA = \ - testsuite.ycp - module_DATA = \ - Testsuite.ycp + modules/Testsuite.rb + +ynclude_DATA = \ + include/testsuite.rb -EXTRA_DIST = $(ynclude_DATA) $(module_DATA) +EXTRA_DIST = $(module_DATA) $(ynclude_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) ybcfiles = $(filter %.ybc,$(modulebin_DATA)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/src/Testsuite.ycp new/yast2-testsuite-3.0.0/src/Testsuite.ycp --- old/yast2-testsuite-2.24.4/src/Testsuite.ycp 2013-01-22 12:19:28.000000000 +0100 +++ new/yast2-testsuite-3.0.0/src/Testsuite.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ -/** - * File: modules/Testsuite.ycp - * Package: Testsuite - * Summary: Main testsuite module - * Authors: Michal Svec <[email protected]> - * - * $Id$ - */ - -{ - -module "Testsuite"; - -/** - * Secret string :-) - */ -string dummy_log_string = "LOGTHIS_SECRET_314 "; - -/** - * @param INPUT a tuple of read, write and execute maps - * @param DEFAULT default read value - * @return list of various SCR return values - */ -global list Init (list<any> INPUT, any DEFAULT) { - - any defaultv = $[]; - - any read = INPUT[0]: defaultv; - any write = INPUT[1]: defaultv; - any exec = INPUT[2]: defaultv; - - y2debug ("READ=%1", read); - y2debug ("WRITE=%1", write); - y2debug ("EXECUTE=%1", exec); - y2debug ("DEFAULT=%1", DEFAULT); - - // initialize - list ret = []; - ret = add (ret, SCR::UnregisterAllAgents ()); - ret = add (ret, SCR::RegisterAgent (., `ag_dummy(`DataMap(read, write, exec, DEFAULT)))); - y2debug ("ret=%1", ret); - - return ret; -} - -/** - * @param FUNCTION a single or deep quoted term - * @param INPUT a tuple of read, write and execute maps - * @param DEFAULT default read value - * @return whatever the FUNCTION returns - */ -global define any Test (any FUNCTION, list<any> INPUT, any DEFAULT) { - - y2debug ("FUNCTION=%1", FUNCTION); - - Init (INPUT, DEFAULT); - - any real_ret = eval (FUNCTION); - - y2debug ("%1Return\t%2", dummy_log_string, real_ret); - - return real_ret; -} - -/** - * Dump value to the testsuite output (keyword: Dump) - * @param output whatever to be dumped into the log - */ -global void Dump (any output) { - string out = sformat ("%1", output); - list<string> lines = splitstring (out, "\n"); - maplist (string l, lines, { - return y2debug ("%1Dump\t%2", dummy_log_string, l); - }); - if(size(lines) < 1) - y2debug ("%1Dump\t%2", dummy_log_string, out); -} - -/** - * Dump file contents to the testsuite output (keyword: File) - * @param filename file to be dumped - */ -global void DumpFile (string filename) { - - string command = sformat("/bin/cat \"%1\" | sed \"s/^/%2File\t/\"", - filename, dummy_log_string); - - SCR::RegisterAgent (.target, "/usr/share/YaST2/scrconf/target.scr"); - map res = (map) SCR::Execute (.target.bash_output, command); - SCR::UnregisterAllAgents (); - - string out = res["stdout"]:" (nil)"; - list<string> lines = splitstring (out, "\n"); - maplist (string l, lines, { - return y2debug ("%1", l); - }); - if(size(lines) < 1) - y2debug ("%1File\t%2", dummy_log_string, out); -} - -/** - * Constructor (initialize SCR with dummy agent) - */ -void Testsuite() { - Init ([], nil); -} - -/* EOF */ -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/src/include/testsuite.rb new/yast2-testsuite-3.0.0/src/include/testsuite.rb --- old/yast2-testsuite-2.24.4/src/include/testsuite.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-testsuite-3.0.0/src/include/testsuite.rb 2013-07-30 14:05:06.000000000 +0200 @@ -0,0 +1,37 @@ +# encoding: utf-8 + +# File: include/testsuite.ycp +# Package: Testsuite +# Summary: Main testsuite include +# Authors: Michal Svec <[email protected]> +# +# $Id$ +module Yast + module TestsuiteInclude + def initialize_testsuite(include_target) + Yast.import "Testsuite" + end + + def TESTSUITE_INIT(_INPUT, _DEFAULT) + _INPUT = deep_copy(_INPUT) + _DEFAULT = deep_copy(_DEFAULT) + Testsuite.Init(_INPUT, _DEFAULT) + end + + def TEST(_FUNCTION, _INPUT, _DEFAULT) + _FUNCTION = deep_copy(_FUNCTION) + _INPUT = deep_copy(_INPUT) + _DEFAULT = deep_copy(_DEFAULT) + Testsuite.Test(_FUNCTION, _INPUT, _DEFAULT) + end + + def DUMP(output) + output = deep_copy(output) + Testsuite.Dump(output) + end + + def DUMPFILE(filename) + Testsuite.DumpFile(filename) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/src/modules/Testsuite.rb new/yast2-testsuite-3.0.0/src/modules/Testsuite.rb --- old/yast2-testsuite-2.24.4/src/modules/Testsuite.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-testsuite-3.0.0/src/modules/Testsuite.rb 2013-07-30 14:05:06.000000000 +0200 @@ -0,0 +1,125 @@ +# encoding: utf-8 + +# File: modules/Testsuite.ycp +# Package: Testsuite +# Summary: Main testsuite module +# Authors: Michal Svec <[email protected]> +# +# $Id$ +require "yast" + +module Yast + class TestsuiteClass < Module + def main + + # Secret string :-) + @dummy_log_string = "LOGTHIS_SECRET_314 " + Testsuite() + end + + # @param [Array] INPUT a tuple of read, write and execute maps + # @param [Object] DEFAULT default read value + # @return [Array] of various SCR return values + def Init(_INPUT, _DEFAULT) + _INPUT = deep_copy(_INPUT) + _DEFAULT = deep_copy(_DEFAULT) + defaultv = {} + + read = Ops.get(_INPUT, 0, defaultv) + write = Ops.get(_INPUT, 1, defaultv) + exec = Ops.get(_INPUT, 2, defaultv) + + Builtins.y2debug("READ=%1", read) + Builtins.y2debug("WRITE=%1", write) + Builtins.y2debug("EXECUTE=%1", exec) + Builtins.y2debug("DEFAULT=%1", _DEFAULT) + + # initialize + ret = [] + ret = Builtins.add(ret, SCR.UnregisterAllAgents) + ret = Builtins.add( + ret, + SCR.RegisterAgent( + path("."), + term(:ag_dummy, term(:DataMap, read, write, exec, _DEFAULT)) + ) + ) + Builtins.y2debug("ret=%1", ret) + + deep_copy(ret) + end + + # @param [Object] FUNCTION a single or deep quoted term + # @param [Array] INPUT a tuple of read, write and execute maps + # @param [Object] DEFAULT default read value + # @return whatever the FUNCTION returns + def Test(_FUNCTION, _INPUT, _DEFAULT) + _FUNCTION = deep_copy(_FUNCTION) + _INPUT = deep_copy(_INPUT) + _DEFAULT = deep_copy(_DEFAULT) + Builtins.y2debug("FUNCTION=%1", _FUNCTION) + + Init(_INPUT, _DEFAULT) + + real_ret = Builtins.eval(_FUNCTION) + + Builtins.y2debug("%1Return\t%2", @dummy_log_string, real_ret) + + deep_copy(real_ret) + end + + # Dump value to the testsuite output (keyword: Dump) + # @param [Object] output whatever to be dumped into the log + def Dump(output) + output = deep_copy(output) + out = Builtins.sformat("%1", output) + lines = Builtins.splitstring(out, "\n") + Builtins.maplist(lines) do |l| + Builtins.y2debug("%1Dump\t%2", @dummy_log_string, l) + end + if Ops.less_than(Builtins.size(lines), 1) + Builtins.y2debug("%1Dump\t%2", @dummy_log_string, out) + end + + nil + end + + # Dump file contents to the testsuite output (keyword: File) + # @param [String] filename file to be dumped + def DumpFile(filename) + command = Builtins.sformat( + "/bin/cat \"%1\" | sed \"s/^/%2File\t/\"", + filename, + @dummy_log_string + ) + + SCR.RegisterAgent(path(".target"), "/usr/share/YaST2/scrconf/target.scr") + res = Convert.to_map(SCR.Execute(path(".target.bash_output"), command)) + SCR.UnregisterAllAgents + + out = Ops.get_string(res, "stdout", " (nil)") + lines = Builtins.splitstring(out, "\n") + Builtins.maplist(lines) { |l| Builtins.y2debug("%1", l) } + if Ops.less_than(Builtins.size(lines), 1) + Builtins.y2debug("%1File\t%2", @dummy_log_string, out) + end + + nil + end + + # Constructor (initialize SCR with dummy agent) + def Testsuite + Init([], nil) + + nil + end + + publish :function => :Init, :type => "list (list, any)" + publish :function => :Test, :type => "any (any, list, any)" + publish :function => :Dump, :type => "void (any)" + publish :function => :DumpFile, :type => "void (string)" + end + + Testsuite = TestsuiteClass.new + Testsuite.main +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/src/testsuite.ycp new/yast2-testsuite-3.0.0/src/testsuite.ycp --- old/yast2-testsuite-2.24.4/src/testsuite.ycp 2013-01-22 12:19:28.000000000 +0100 +++ new/yast2-testsuite-3.0.0/src/testsuite.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -/** - * File: include/testsuite.ycp - * Package: Testsuite - * Summary: Main testsuite include - * Authors: Michal Svec <[email protected]> - * - * $Id$ - */ - -{ - -import "Testsuite"; - -define list TESTSUITE_INIT (list<any> INPUT, any DEFAULT) { - return Testsuite::Init(INPUT, DEFAULT); -} - -define any TEST (any FUNCTION, list<any> INPUT, any DEFAULT) { - return Testsuite::Test(FUNCTION, INPUT, DEFAULT); -} - -define void DUMP (any output) { - return Testsuite::Dump (output); -} - -define void DUMPFILE (string filename) { - return Testsuite::DumpFile (filename); -} - -/* EOF */ -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/testsuite/Makefile.am new/yast2-testsuite-3.0.0/testsuite/Makefile.am --- old/yast2-testsuite-2.24.4/testsuite/Makefile.am 2013-01-22 12:19:28.000000000 +0100 +++ new/yast2-testsuite-3.0.0/testsuite/Makefile.am 2013-07-30 14:05:06.000000000 +0200 @@ -6,13 +6,13 @@ TESTFLAGS=-I $(top_srcdir)/src -M $(top_srcdir)/src check-local: - ../skel/runtest.sh ${TESTFLAGS} ./test.ycp tmp.out tmp.err + ../skel/runtest.sh ${TESTFLAGS} ./test.rb tmp.out tmp.err diff -u test.err tmp.err diff -u test.out tmp.out clean-local: $(RM) tmp.* -EXTRA_DIST= dump_file test.ycp test.out test.err +EXTRA_DIST= dump_file test.rb test.out test.err # EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/testsuite/Makefile.in new/yast2-testsuite-3.0.0/testsuite/Makefile.in --- old/yast2-testsuite-2.24.4/testsuite/Makefile.in 2013-07-02 11:02:11.000000000 +0200 +++ new/yast2-testsuite-3.0.0/testsuite/Makefile.in 2013-07-31 10:56:27.000000000 +0200 @@ -57,7 +57,7 @@ subdir = testsuite DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -190,7 +190,7 @@ ystartupdir = @ystartupdir@ AUTOMAKE_OPTIONS = TESTFLAGS = -I $(top_srcdir)/src -M $(top_srcdir)/src -EXTRA_DIST = dump_file test.ycp test.out test.err +EXTRA_DIST = dump_file test.rb test.out test.err all: all-am .SUFFIXES: @@ -378,7 +378,7 @@ pdf-am ps ps-am uninstall uninstall-am check-local: - ../skel/runtest.sh ${TESTFLAGS} ./test.ycp tmp.out tmp.err + ../skel/runtest.sh ${TESTFLAGS} ./test.rb tmp.out tmp.err diff -u test.err tmp.err diff -u test.out tmp.out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/testsuite/test.rb new/yast2-testsuite-3.0.0/testsuite/test.rb --- old/yast2-testsuite-2.24.4/testsuite/test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-testsuite-3.0.0/testsuite/test.rb 2013-07-30 14:05:06.000000000 +0200 @@ -0,0 +1,85 @@ +# encoding: utf-8 + +# File: +# check.ycp +# +# Module: +# Testsuite +# +# Summary: +# Testsuite check script. +# +# Authors: +# Michal Svec <[email protected]> +# +# $Id$ +module Yast + class TestClient < Client + def main + + Yast.include self, "testsuite.rb" + + @READ = { "read" => { "path" => "read_result" } } + @WRITE = { "write" => { "path" => true } } + @EXEC = { "execute" => { "path" => "execute_result" } } + + TEST(lambda { testfunc }, [@READ, @WRITE, @EXEC], nil) #DEFAULT); + + Builtins.y2error("error_string") + + DUMP("") + DUMP(nil) + + DUMP(731) + DUMP("dump_string") + DUMP("dump_string1\ndump_string2") + DUMPFILE("dump_file") + DUMPFILE("/dev/null") + + # Disable Pkg fake tests now, it does not work + # + # DUMP("Pkg:: testing"); + # define string pkg_testfunc () ``{ + # if (Pkg::IsProvided ("sendmail")) + # { + # return "sendmail"; + # } + # else if (Pkg::IsProvided ("postfix")) + # { + # return "postfix"; + # } + # else + # { + # return "none"; + # } + # } + # + # import "Pkg"; + # + # // Pkg::FAKE (`IsProvided, true); + # TEST(``(pkg_testfunc ()), [], nil); + # + # //Pkg::FAKE (`IsProvided, false); + # TEST(``(pkg_testfunc ()), [], nil); + # + # //Pkg::FAKE (`IsProvided, $["sendmail": false, "postfix": true]); + # TEST(``(pkg_testfunc ()), [], nil); + # + # end of Pkg tests + + nil + end + + #string DEFAULT = "default_string"; + + def testfunc + SCR.Dir(path(".read")) + SCR.Read(path(".read.path")) + SCR.Write(path(".write.path"), "write_arg") + SCR.Execute(path(".execute.path"), "execute_arg") + "return_string" + end + end +end + +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-testsuite-2.24.4/testsuite/test.ycp new/yast2-testsuite-3.0.0/testsuite/test.ycp --- old/yast2-testsuite-2.24.4/testsuite/test.ycp 2013-01-22 12:19:28.000000000 +0100 +++ new/yast2-testsuite-3.0.0/testsuite/test.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -/** - * File: - * check.ycp - * - * Module: - * Testsuite - * - * Summary: - * Testsuite check script. - * - * Authors: - * Michal Svec <[email protected]> - * - * $Id$ - */ - -{ - -include "./../src/testsuite.ycp"; - -map READ = $[ "read" : $[ "path" : "read_result" ] ]; -map WRITE = $[ "write" : $[ "path" : true ] ]; -map EXEC = $[ "execute" : $[ "path" : "execute_result" ] ]; - -//string DEFAULT = "default_string"; - -define string testfunc() ``{ - SCR::Dir(.read); - SCR::Read(.read.path); - SCR::Write(.write.path, "write_arg"); - SCR::Execute(.execute.path, "execute_arg"); - return "return_string"; -} - -TEST(``(testfunc()), [ READ, WRITE, EXEC ], nil); //DEFAULT); - -y2error("error_string"); - -DUMP(""); -DUMP(nil); - -DUMP(731); -DUMP("dump_string"); -DUMP("dump_string1\ndump_string2"); -DUMPFILE("dump_file"); -DUMPFILE("/dev/null"); - -/* Disable Pkg fake tests now, it does not work - -DUMP("Pkg:: testing"); -define string pkg_testfunc () ``{ - if (Pkg::IsProvided ("sendmail")) - { - return "sendmail"; - } - else if (Pkg::IsProvided ("postfix")) - { - return "postfix"; - } - else - { - return "none"; - } -} - -import "Pkg"; - -// Pkg::FAKE (`IsProvided, true); -TEST(``(pkg_testfunc ()), [], nil); - -//Pkg::FAKE (`IsProvided, false); -TEST(``(pkg_testfunc ()), [], nil); - -//Pkg::FAKE (`IsProvided, $["sendmail": false, "postfix": true]); -TEST(``(pkg_testfunc ()), [], nil); - -end of Pkg tests -*/ - -} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
