[Ocfs2-test-devel] [PATCH 1/1] ocfs2-test: Fix problem when running from a RPM installed directory.

[tristan.ye]

Looks good, I liked the name 'tmp' for storing temporary files like
mpihosts:-)

Tristan

On Wed, 2009-02-18 at 19:19 -0800, Marcos Matsunaga wrote:
> - Config.make create the directory tmp and sets 1777 permission.
> - ocfs2-test.spec-generic.in adds the tmp dir to the list of RPM files.
> - changed the skel files to point to O2TDIR/tmp/mpihosts
> 
> Signed-off-by: Marcos Matsunaga <Marcos.Matsunaga at oracle.com>
> ---
>  programs/python_common/Config.make       |    4 ++--
>  programs/python_common/config_py.skel    |    2 +-
>  programs/python_common/config_shell.skel |    2 +-
>  vendor/common/ocfs2-test.spec-generic.in |    1 +
>  4 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/programs/python_common/Config.make b/programs/python_common/Config.make
> index 92787b8..fef1b4c 100644
> --- a/programs/python_common/Config.make
> +++ b/programs/python_common/Config.make
> @@ -15,7 +15,7 @@ ifdef CONFIG_SCRIPT
>  	$(SHELL) $(CURDIR)/$(CONFIG_SCRIPT) $(DESTDIR) $(INSTALLDIR)
>  endif
>  
> -	mkdir -p  $(DESTDIR)/workfiles $(DESTDIR)/log
> -	chmod 1777 $(DESTDIR)/log
> +	mkdir -p  $(DESTDIR)/workfiles $(DESTDIR)/log $(DESTDIR)/tmp
> +	chmod 1777 $(DESTDIR)/log $(DESTDIR)/tmp
>  
>  install: config-script
> diff --git a/programs/python_common/config_py.skel b/programs/python_common/config_py.skel
> index f27b2b8..263d056 100755
> --- a/programs/python_common/config_py.skel
> +++ b/programs/python_common/config_py.skel
> @@ -31,7 +31,7 @@ LIBDIR = O2TDIR + '/lib'
>  
>  LOGFILE = O2TDIR + '/log/o2t.log'
>  
> -MPIHOSTS = WORKFILESDIR + '/mpihosts'
> +MPIHOSTS = O2TDIR + '/tmp/mpihosts'
>  
>  KERNELDIR = 'linux*'
>  
> diff --git a/programs/python_common/config_shell.skel b/programs/python_common/config_shell.skel
> index 71680f1..629d930 100755
> --- a/programs/python_common/config_shell.skel
> +++ b/programs/python_common/config_shell.skel
> @@ -30,7 +30,7 @@ LIBDIR=${O2TDIR}/lib
>  export LIBDIR
>  LOGFILE=${O2TDIR}/log/o2t.log
>  export LOGFILE
> -MPIHOSTS=${WORKFILESDIR}/mpihosts
> +MPIHOSTS=${O2TDIR}/tmp/mpihosts
>  export MPIHOSTS
>  KERNELDIR=linux*
>  export KERNELDIR
> diff --git a/vendor/common/ocfs2-test.spec-generic.in b/vendor/common/ocfs2-test.spec-generic.in
> index a8375ee..7f2c487 100644
> --- a/vendor/common/ocfs2-test.spec-generic.in
> +++ b/vendor/common/ocfs2-test.spec-generic.in
> @@ -206,6 +206,7 @@ rm -rf "$RPM_BUILD_ROOT"
>  %{_installdir}/bin/quota_tests.sh
>  %{_installdir}/bin/run_quota_multi_tests.py
>  %{_installdir}/log
> +%{_installdir}/tmp
>  %{_installdir}/workfiles/fsck-test/medium-disk/fsck.ocfs2.00.stdout
>  %{_installdir}/workfiles/fsck-test/medium-disk/fsck.ocfs2.01.stdout
>  %{_installdir}/workfiles/fsck-test/medium-disk/fsck.ocfs2.02.stdout