[Gfarm-commits] SF.net SVN: gfarm:[7237] gfarm_v2/branches/2.6

[<n-...@us...>]

Revision: 7237
          http://gfarm.svn.sourceforge.net/gfarm/?rev=7237&view=rev
Author:   n-soda
Date:     2012-11-30 19:51:07 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
merge r7236 from the main trunk:
make these test scripts work with --srcdir option of the configure command.
these tests are for #517 - "cp -a dir1 dir2" on gfarm2fs: Invalid argument.

Revision Links:
--------------
    http://gfarm.svn.sourceforge.net/gfarm/?rev=7236&view=rev

Modified Paths:
--------------
    gfarm_v2/branches/2.6/regress/lib/libgfarm/gfarm/gfs_acl/empty_access_file.sh
    gfarm_v2/branches/2.6/regress/lib/libgfarm/gfarm/gfs_acl/empty_default_file.sh

Property Changed:
----------------
    gfarm_v2/branches/2.6/


Property changes on: gfarm_v2/branches/2.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329
/gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999
/gfarm_v2/trunk:5598,5616-5624,5627-5628,5641-5647,5650,5653,5657-5666,5670,5674,5683-5685,5693,5695-5696,5699,5719-5720,5727,5729-5730,5775,5793,5799,5808-5809,5818,5821,5825,5827-5831,5839-5842,5844-5849,5863-5864,5868,5870,5874-5878,5886,5889,5913,5915,5924,5932,5934,5959,6001-6003,6012-6013,6016,6019,6025-6027,6029,6040,6062,6065,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6118,6120,6129,6137,6139,6152-6153,6155,6159,6161,6166,6168,6173,6175,6178-6179,6184-6185,6188,6268,6272,6295,6305-6306,6310,6315,6333,6335,6354,6397,6427,6437,6452,6458-6459,6469-6470,6567,6571,6577,6580-6581,6604,6614,6616,6630,6645,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6823,6825,6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7012,7097,7099,7101,7103,7178,7185,7200,7218-7222,7229,7233
   + /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329
/gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999
/gfarm_v2/trunk:5598,5616-5624,5627-5628,5641-5647,5650,5653,5657-5666,5670,5674,5683-5685,5693,5695-5696,5699,5719-5720,5727,5729-5730,5775,5793,5799,5808-5809,5818,5821,5825,5827-5831,5839-5842,5844-5849,5863-5864,5868,5870,5874-5878,5886,5889,5913,5915,5924,5932,5934,5959,6001-6003,6012-6013,6016,6019,6025-6027,6029,6040,6062,6065,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6118,6120,6129,6137,6139,6152-6153,6155,6159,6161,6166,6168,6173,6175,6178-6179,6184-6185,6188,6268,6272,6295,6305-6306,6310,6315,6333,6335,6354,6397,6427,6437,6452,6458-6459,6469-6470,6567,6571,6577,6580-6581,6604,6614,6616,6630,6645,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6823,6825,6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7012,7097,7099,7101,7103,7178,7185,7200,7218-7222,7229,7233,7236

Modified: gfarm_v2/branches/2.6/regress/lib/libgfarm/gfarm/gfs_acl/empty_access_file.sh
===================================================================
--- gfarm_v2/branches/2.6/regress/lib/libgfarm/gfarm/gfs_acl/empty_access_file.sh	2012-11-30 19:48:30 UTC (rev 7236)
+++ gfarm_v2/branches/2.6/regress/lib/libgfarm/gfarm/gfs_acl/empty_access_file.sh	2012-11-30 19:51:07 UTC (rev 7237)
@@ -6,7 +6,7 @@
 
 trap 'gfrm -f $gftmp; exit $exit_trap' $trap_sigs
 
-if gfreg data/1byte $gftmp &&
+if gfreg $data/1byte $gftmp &&
    $empty_acl -a $gftmp
 then
     exit_code=$exit_pass

Modified: gfarm_v2/branches/2.6/regress/lib/libgfarm/gfarm/gfs_acl/empty_default_file.sh
===================================================================
--- gfarm_v2/branches/2.6/regress/lib/libgfarm/gfarm/gfs_acl/empty_default_file.sh	2012-11-30 19:48:30 UTC (rev 7236)
+++ gfarm_v2/branches/2.6/regress/lib/libgfarm/gfarm/gfs_acl/empty_default_file.sh	2012-11-30 19:51:07 UTC (rev 7237)
@@ -6,7 +6,7 @@
 
 trap 'gfrm -f $gftmp; exit $exit_trap' $trap_sigs
 
-if gfreg data/1byte $gftmp &&
+if gfreg $data/1byte $gftmp &&
    $empty_acl -d $gftmp
 then
     exit_code=$exit_pass

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.