You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:23:32 UTC
svn commit: r1077520 - in
/hadoop/common/branches/branch-0.20-security-patches: build.xml
src/test/smoke-tests
Author: omalley
Date: Fri Mar 4 04:23:32 2011
New Revision: 1077520
URL: http://svn.apache.org/viewvc?rev=1077520&view=rev
Log:
commit 734e906536d2969e403a4e93d1c993e625220415
Author: Konstantin Boudnik <co...@goodenter-lm.local>
Date: Wed Jun 30 18:20:20 2010 -0700
HADOOP-6810 from https://issues.apache.org/jira/secure/attachment/12448431/smoke-tests.1.patch
Modified:
hadoop/common/branches/branch-0.20-security-patches/build.xml
hadoop/common/branches/branch-0.20-security-patches/src/test/smoke-tests
Modified: hadoop/common/branches/branch-0.20-security-patches/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/build.xml?rev=1077520&r1=1077519&r2=1077520&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/build.xml Fri Mar 4 04:23:32 2011
@@ -861,6 +861,15 @@
</and>
</condition>
<!-- ================================================================== -->
+ <!-- Define exclude lists for different kinds of testing -->
+ <!-- ================================================================== -->
+ <patternset id="empty.exclude.list.id" />
+ <patternset id="commit.smoke.exclude.list.id">
+ <excludesfile name="${test.commit.tests.file}"/>
+ <excludesfile name="${test.smoke.tests.file}"/>
+ </patternset>
+
+ <!-- ================================================================== -->
<!-- Run unit tests -->
<!-- ================================================================== -->
@@ -873,6 +882,7 @@
<attribute name="hadoop.conf.dir.deployed" default="" />
<attribute name="test.krb5.conf" default="" />
<attribute name="test.krb5.conf.filename" default="" />
+ <attribute name="exclude.list.id" default="empty.exclude.list.id" />
<sequential>
<delete file="${test.build.dir}/testsfailed"/>
<delete dir="${test.build.data}"/>
@@ -935,6 +945,7 @@
<patternset>
<includesfile name="@{test.file}"/>
</patternset>
+ <patternset refid="@{exclude.list.id}"/>
</fileset>
</batchtest>
<batchtest todir="${test.build.dir}" if="tests.notestcase.fi">
@@ -959,13 +970,19 @@
</sequential>
</macrodef>
- <target name="test-core" depends="jar-test" description="Run core unit tests">
+ <target name="test-core" depends="test-commit, test-smoke,
+ test-core-excluding-commit-and-smoke, jar-test"
+ description="Run core unit tests">
+ </target>
+
+ <target name="test-core-excluding-commit-and-smoke" depends="jar-test">
<macro-test-runner test.file="${test.all.tests.file}"
classpath="${test.classpath.id}"
test.dir="${test.build.dir}"
fileset.dir="${test.src.dir}"
test.krb5.conf="java.security.krb5.conf"
test.krb5.conf.filename="${test.src.dir}/krb5.conf"
+ exclude.list.id="commit.smoke.exclude.list.id"
>
</macro-test-runner>
</target>
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/smoke-tests
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/smoke-tests?rev=1077520&r1=1077519&r2=1077520&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/smoke-tests (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/smoke-tests Fri Mar 4 04:23:32 2011
@@ -1,94 +1,87 @@
# -------------------------- common --------------------------
-**/TestUrlStreamHandler.java
-**/TestBlockReplacement.java
-**/TestDiskError.java
-**/TestInterDatanodeProtocol.java
-**/TestCheckpoint.java
-**/TestEditLog.java
-**/TestFileLimit.java
-**/TestHeartbeatHandling.java
-**/TestHost2NodesMap.java
-**/TestNamenodeCapacityReport.java
-**/TestPendingReplication.java
-**/TestReplicationPolicy.java
-**/TestStartup.java
-**/TestAbandonBlock.java
-**/TestBlocksScheduledCounter.java
-**/TestDatanodeReport.java
-**/TestDataTransferProtocol.java
-**/TestDFSShell.java
-**/TestDFSUpgradeFromImage.java
-**/TestDistributedFileSystem.java
-**/TestFileAppend.java
-**/TestFileAppend2.java
-**/TestFileAppend3.java
-**/TestFileCorruption.java
-**/TestFileStatus.java
-**/TestFSInputChecker.java
-**/TestFSOutputSummer.java
-**/TestGetBlocks.java
-**/TestHDFSTrash.java
-**/TestLease.java
-**/TestLeaseRecovery.java
-**/TestLocalDFS.java
-**/TestMissingBlocksAlert.java
-**/TestPread.java
-**/TestQuota.java
-**/TestRestartDFS.java
-**/TestSafeMode.java
-**/TestNetworkTopology.java
-**/TestPermission.java
+**/TestAsyncDiskService.java
+**/TestAvroFSInput.java
+**/TestAvroRpc.java
+**/TestAvroSerialization.java
+**/TestBlockLocation.java
+**/TestBoundedByteArrayOutputStream.java
+**/TestBuffer.java
+**/TestConfigurationDeprecation.java
+**/TestConfigurationSubclass.java
+**/TestConfServlet.java
+**/TestDeprecatedKeys.java
+**/TestDFVariations.java
+**/TestDiskChecker.java
+**/TestDNS.java
+**/TestEnumSetWritable.java
+**/TestFcLocalFsPermission.java
+**/TestFcLocalFsUtil.java
+**/TestFileContextDeleteOnExit.java
+**/TestFileSystemCaching.java
+**/TestFilterFileSystem.java
+**/TestFilterFs.java
+**/TestFsShellReturnCode.java
+**/TestGetInstances.java
+**/TestHostsFileReader.java
+**/TestHttpServerLifecycle.java
+**/TestMetricsServlet.java
+**/TestMiniRPCBenchmark.java
+**/TestNetUtils.java
+**/TestOutputRecord.java
+**/TestPureJavaCrc32.java
+**/TestRunJar.java
+**/TestSequenceFileSync.java
+
# -------------------------- hdfs --------------------------
-**/TestBloomMapFile.java
-**/TestDelegationToken.java
-**/TestDoAsEffectiveUser.java
-**/TestHttpServer.java
-**/TestIndexedSort.java
-**/TestInMemoryNativeS3FileSystemContract.java
-**/TestInMemoryS3FileSystemContract.java
-**/TestINode.java
-**/TestIPC.java
-**/TestIPCServerResponder.java
-**/TestKosmosFileSystem.java
-**/TestLocalDirAllocator.java
-**/TestRecordIO.java
-**/TestRecordVersioning.java
-**/TestReflectionUtils.java
-**/TestRetryProxy.java
-**/TestRPC.java
-**/TestS3Credentials.java
-**/TestS3FileSystem.java
-**/TestSaslRPC.java
-**/TestSequenceFileSerialization.java
-**/TestTFileByteArrays.java
-**/TestTFileComparators.java
-**/TestTFile.java
-**/TestTFileJClassComparatorByteArrays.java
-**/TestTFileLzoCodecsByteArrays.java
-**/TestTFileLzoCodecsStreams.java
-**/TestTFileNoneCodecsByteArrays.java
-**/TestTFileNoneCodecsJClassComparatorByteArrays.java
-**/TestTFileNoneCodecsStreams.java
-**/TestTFileSeek.java
-**/TestTFileSeqFileComparison.java
-**/TestTFileSplit.java
-**/TestTFileStreams.java
-**/TestTFileUnsortedByteArrays.java
-**/TestTruncatedInputBug.java
-**/TestVersionedWritable.java
-**/TestWritableSerialization.java
-**/TestCLI.java
-**/TestFTPFileSystem.java
-**/TestDFSStorageStateRecovery.java
-**/TestDFSRollback.java
-**/TestDFSRename.java
-**/TestDFSMkdirs.java
-**/TestDFSFinalize.java
-**/TestFileCreationNamenodeRestart.java
+**/TestBalancer.java
**/TestClientProtocolWithDelegationToken.java
+**/TestCrcCorruption.java
+**/TestDFSClientRetries.java
+**/TestDFSFinalize.java
+**/TestDFSMkdirs.java
+**/TestDFSPermission.java
+**/TestDFSRename.java
+**/TestDFSRollback.java
+**/TestDFSStartupVersions.java
+**/TestDFSStorageStateRecovery.java
+**/TestDFSUpgrade.java
+**/TestDataNodeMetrics.java
+**/TestDatanodeBlockScanner.java
+**/TestDatanodeDeath.java
+**/TestDecommission.java
**/TestDelegationTokenAuthMethod.java
-**/TestInterDatanodeProtocol.java
+**/TestDelimitedImageVisitor.java
+**/TestDistributedUpgrade.java
+**/TestFTPFileSystem.java
+**/TestFileCreation.java
+**/TestFileCreationClient.java
+**/TestFileCreationDelete.java
+**/TestFileCreationEmpty.java
+**/TestFileCreationNamenodeRestart.java
+**/TestFsck.java
+**/TestGlobPaths.java
+**/TestHDFSFileSystemContract.java
+**/TestInjectionForSimulatedStorage.java
+**/TestJMXGet.java
+**/TestLeaseRecovery2.java
+**/TestLoadGenerator.java
+**/TestModTime.java
+**/TestNNThroughputBenchmark.java
+**/TestNameEditsConfigs.java
**/TestNameNodeMetrics.java
+**/TestNodeCount.java
+**/TestOIVCanReadOldVersions.java
+**/TestOfflineImageViewer.java
+**/TestRenameWhileOpen.java
+**/TestReplication.java
+**/TestSeekBug.java
+**/TestSetTimes.java
+**/TestSetrepDecreasing.java
+**/TestSetrepIncreasing.java
+**/TestSmallBlock.java
+**/TestStickyBit.java
+**/TestUnderReplicatedBlocks.java
+
# -------------------------- mapred --------------------------
**/TestMiniMRChildTask.java
**/TestMiniMRBringup.java