From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 18 Feb 2010 09:23:55 +0000 (+0100)
Subject: Discard prev regress test results
X-Git-Tag: Release-5.2.1~1713
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=860246ae91ac55f0b5e6f7ac0e71ed8d4180c67a;p=bacula%2Fbacula

Discard prev regress test results
---

diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c
index 6227fd3b84..b4a4f37475 100644
--- a/bacula/src/filed/xattr.c
+++ b/bacula/src/filed/xattr.c
@@ -749,7 +749,7 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt)
           * Print the current name into the buffer as its not null terminated we need to
           * use the length encoded in the string for copying only the needed bytes.
           */
-         cnt = MIN((sizeof(current_attrname) - 1), xattr_list[index]);
+         cnt = MIN((int)(sizeof(current_attrname) - 1), xattr_list[index]);
          strncpy(current_attrname, xattr_list + (index + 1), cnt);
          current_attrname[cnt] = '\0';
 
@@ -980,7 +980,7 @@ static bxattr_exit_code bsd_parse_xattr_streams(JCR *jcr, int stream)
        */
       cnt = extattr_set_link(jcr->last_fname, current_attrnamespace,
                              attrname, current_xattr->value, current_xattr->value_length);
-      if (cnt < 0 || cnt != current_xattr->value_length) {
+      if (cnt < 0 || cnt != (int)current_xattr->value_length) {
          switch (errno) {
          case ENOENT:
             goto bail_out;
diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index 507b3d2e7b..c8bf7ae11e 100755
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -30,7 +30,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
+@out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
 @#setdebug level=200 storage=tape
@@ -60,7 +60,7 @@ END_OF_DATA
 
 run_bacula
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@$out /dev/null
+@out /dev/null
 messages
 @# 
 @# now do a restore