Index: hcatalog/tests/hcat.conf =================================================================== --- hcatalog/tests/hcat.conf (revision 1163748) +++ hcatalog/tests/hcat.conf (working copy) @@ -346,7 +346,7 @@ { 'num' => 1, 'hive' => "show tables;", - 'expected_out_regex' => "OK", + 'expected_err_regex' => "OK", }, { 'num' => 5, @@ -728,10 +728,10 @@ b = foreach a generate org.apache.hcatalog.utils.HCatTypeCheck('boolean+int', *); store b into ':OUTPATH:'; ", - 'rc' => 0, - 'expected_err_regex' => "Success", + 'rc' => 6, + 'expected_err_regex' => "ERROR", # 'expected_out_regex' => "1", - # 'not_expected_out_regex' => "[^1\\t]", + 'not_expected_out_regex' => "Success", }, @@ -1427,7 +1427,7 @@ { 'num' => 3, # complex stored by pig - 'depends_on' => 'hcat_pig2pig_setup_tables_2', # not really, but #4 does + # 'depends_on' => 'hcat_pig2pig_setup_tables_2', # not really, but #4 does 'hive' => " CREATE TABLE tmp_pig2pig_stored_complex_:RUNID: ( mymap map, Index: hcatalog/conf/default.conf =================================================================== --- hcatalog/conf/default.conf (revision 1163748) +++ hcatalog/conf/default.conf (working copy) @@ -63,7 +63,8 @@ #HIVE , 'hive_bin_location' => "$ENV{HIVE_ROOT}/build/dist/bin" - + + , 'metastore.principal' => "$ENV{METASTORE_PRINCIPAL}" #HCATALOG ,'thriftserver' => "$ENV{HCAT_URL}" ,'hcatalog.jar' => "$ENV{HCAT_JAR},file://$ENV{HIVE_ROOT}/lib/thrift-fb303-0.5.0.jar,file://$ENV{HIVE_ROOT}/lib/thrift-0.5.0.jar,file://$ENV{HIVE_ROOT}/build/metastore/hive-metastore-0.8.0-SNAPSHOT.jar,file://$ENV{HIVE_ROOT}/build/common/hive-common-0.8.0-SNAPSHOT.jar,file://$ENV{HIVE_ROOT}/build/shims/hive-shims-0.8.0-SNAPSHOT.jar,file://$ENV{HIVE_ROOT}/build/serde/hive-serde-0.8.0-SNAPSHOT.jar,file://$ENV{HIVE_ROOT}/build/ql/hive-exec-0.8.0-SNAPSHOT.jar" Index: hcatalog/drivers/TestDriverHCat.pm =================================================================== --- hcatalog/drivers/TestDriverHCat.pm (revision 1163748) +++ hcatalog/drivers/TestDriverHCat.pm (working copy) @@ -442,8 +442,14 @@ my @cmd = Util::getHiveCmd($testCmd); #Add metastore info - push(@cmd, " --hiveconf hive.metastore.local=false --hiveconf hive.metastore.uris=thrift://".$testCmd->{'thriftserver'}); + push(@cmd, "--hiveconf hive.metastore.local=false --hiveconf hive.metastore.uris=thrift://".$testCmd->{'thriftserver'}); + + if(defined($testCmd->{'metastore.principal'})){ + push(@cmd, "--hiveconf hive.metastore.sasl.enabled=true --hiveconf hive.metastore.kerberos.principal=$testCmd->{'metastore.principal'}"); + + } + # Add hive command file push(@cmd, '-f', $hivefile); Index: hcatalog/build.xml =================================================================== --- hcatalog/build.xml (revision 1163748) +++ hcatalog/build.xml (working copy) @@ -103,11 +103,7 @@ - + @@ -151,7 +147,7 @@ - + @@ -165,8 +161,8 @@ + -