morningman closed pull request #415: Fix compile error in run-fe-ut.sh URL: https://github.com/apache/incubator-doris/pull/415
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/README.md b/README.md index e4c94e94..45664813 100644 --- a/README.md +++ b/README.md @@ -79,14 +79,14 @@ GCC 5.3.1+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.4.3+ * For Ubuntu: ``` -sudo apt-get install g++ ant cmake zip byacc flex automake libtool binutils-dev libiberty-dev bison python2.7 libncurses5-dev +sudo apt-get install g++ cmake zip byacc flex automake libtool binutils-dev libiberty-dev bison python2.7 libncurses5-dev sudo updatedb ``` * For CentOS: ``` -sudo yum install gcc-c++ libstdc++-static ant cmake byacc flex automake libtool binutils-devel bison ncurses-devel +sudo yum install gcc-c++ libstdc++-static cmake byacc flex automake libtool binutils-devel bison ncurses-devel sudo updatedb ``` @@ -96,7 +96,7 @@ If your GCC version is less than 5.3.1, you can run: sudo yum install devtoolset-4-toolchain -y ``` -and then, set the path of gcc (e.g /opt/rh/devtoolset-4/root/usr/bin) to the environment variabl PATH. +and then, set the path of GCC (e.g /opt/rh/devtoolset-4/root/usr/bin) to the environment variable PATH. #### Compile and install diff --git a/fe/src/test/java/org/apache/doris/analysis/CancelAlterStmtTest.java b/fe/src/test/java/org/apache/doris/analysis/CancelAlterStmtTest.java index 7456dfa1..b5c3c592 100644 --- a/fe/src/test/java/org/apache/doris/analysis/CancelAlterStmtTest.java +++ b/fe/src/test/java/org/apache/doris/analysis/CancelAlterStmtTest.java @@ -36,7 +36,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class, ConnectContext.class }) public class CancelAlterStmtTest { diff --git a/fe/src/test/java/org/apache/doris/analysis/DescribeStmtTest.java b/fe/src/test/java/org/apache/doris/analysis/DescribeStmtTest.java index b8c7c121..01a40a44 100644 --- a/fe/src/test/java/org/apache/doris/analysis/DescribeStmtTest.java +++ b/fe/src/test/java/org/apache/doris/analysis/DescribeStmtTest.java @@ -33,7 +33,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class, ConnectContext.class }) public class DescribeStmtTest { private Analyzer analyzer; @@ -79,4 +79,4 @@ public void testAllNormal() throws AnalysisException, UserException { Assert.assertEquals("testCluster:testDb", stmt.getDb()); Assert.assertEquals("testTbl", stmt.getTableName()); } -} \ No newline at end of file +} diff --git a/fe/src/test/java/org/apache/doris/analysis/ShowAlterStmtTest.java b/fe/src/test/java/org/apache/doris/analysis/ShowAlterStmtTest.java index 53468920..1260f23f 100644 --- a/fe/src/test/java/org/apache/doris/analysis/ShowAlterStmtTest.java +++ b/fe/src/test/java/org/apache/doris/analysis/ShowAlterStmtTest.java @@ -33,7 +33,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class ShowAlterStmtTest { private Analyzer analyzer; @@ -86,4 +86,4 @@ public void testNoDb() throws UserException, AnalysisException { stmt.analyze(analyzer); Assert.fail("No exception throws."); } -} \ No newline at end of file +} diff --git a/fe/src/test/java/org/apache/doris/analysis/ShowLoadStmtTest.java b/fe/src/test/java/org/apache/doris/analysis/ShowLoadStmtTest.java index d0627c9b..cb48c206 100644 --- a/fe/src/test/java/org/apache/doris/analysis/ShowLoadStmtTest.java +++ b/fe/src/test/java/org/apache/doris/analysis/ShowLoadStmtTest.java @@ -34,7 +34,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class ShowLoadStmtTest { private Analyzer analyzer; @@ -86,4 +86,4 @@ public void testNoDb() throws UserException, AnalysisException { stmt.analyze(analyzer); Assert.fail("No exception throws."); } -} \ No newline at end of file +} diff --git a/fe/src/test/java/org/apache/doris/catalog/BackendTest.java b/fe/src/test/java/org/apache/doris/catalog/BackendTest.java index 9177b1fd..f07d1dbf 100644 --- a/fe/src/test/java/org/apache/doris/catalog/BackendTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/BackendTest.java @@ -44,7 +44,7 @@ import java.util.Map; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class, MetricRepo.class }) public class BackendTest { private Backend backend; diff --git a/fe/src/test/java/org/apache/doris/catalog/CatalogTest.java b/fe/src/test/java/org/apache/doris/catalog/CatalogTest.java index bf6d4f76..6ef7cd4a 100644 --- a/fe/src/test/java/org/apache/doris/catalog/CatalogTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/CatalogTest.java @@ -49,7 +49,7 @@ import java.util.Random; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class CatalogTest { diff --git a/fe/src/test/java/org/apache/doris/catalog/ColumnTest.java b/fe/src/test/java/org/apache/doris/catalog/ColumnTest.java index 7603fd6a..7ef93075 100644 --- a/fe/src/test/java/org/apache/doris/catalog/ColumnTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/ColumnTest.java @@ -37,7 +37,7 @@ import java.io.FileOutputStream; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class ColumnTest { diff --git a/fe/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java b/fe/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java index edf14d08..8c05796a 100644 --- a/fe/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java @@ -38,7 +38,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class ColumnTypeTest { @Before diff --git a/fe/src/test/java/org/apache/doris/catalog/CreateTableTest.java b/fe/src/test/java/org/apache/doris/catalog/CreateTableTest.java index fc7f8359..ea971310 100644 --- a/fe/src/test/java/org/apache/doris/catalog/CreateTableTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/CreateTableTest.java @@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicLong; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class, SystemInfoService.class }) public class CreateTableTest { diff --git a/fe/src/test/java/org/apache/doris/catalog/DatabaseTest.java b/fe/src/test/java/org/apache/doris/catalog/DatabaseTest.java index 557d8f36..b725c144 100644 --- a/fe/src/test/java/org/apache/doris/catalog/DatabaseTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/DatabaseTest.java @@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class DatabaseTest { diff --git a/fe/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java b/fe/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java index 754383ff..205c69dc 100644 --- a/fe/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java @@ -39,7 +39,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class MaterializedIndexTest { diff --git a/fe/src/test/java/org/apache/doris/catalog/MysqlTableTest.java b/fe/src/test/java/org/apache/doris/catalog/MysqlTableTest.java index 86b1559d..a0451f71 100644 --- a/fe/src/test/java/org/apache/doris/catalog/MysqlTableTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/MysqlTableTest.java @@ -45,7 +45,7 @@ import java.util.Map; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class MysqlTableTest { private List<Column> columns; diff --git a/fe/src/test/java/org/apache/doris/catalog/TableTest.java b/fe/src/test/java/org/apache/doris/catalog/TableTest.java index 7cc178e8..0b5fa890 100644 --- a/fe/src/test/java/org/apache/doris/catalog/TableTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/TableTest.java @@ -38,7 +38,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class TableTest { diff --git a/fe/src/test/java/org/apache/doris/catalog/TabletTest.java b/fe/src/test/java/org/apache/doris/catalog/TabletTest.java index 3c588833..6482e229 100644 --- a/fe/src/test/java/org/apache/doris/catalog/TabletTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/TabletTest.java @@ -37,7 +37,7 @@ import java.io.FileOutputStream; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class }) public class TabletTest { diff --git a/fe/src/test/java/org/apache/doris/catalog/UserPropertyTest.java b/fe/src/test/java/org/apache/doris/catalog/UserPropertyTest.java index 7fc08f80..df546f86 100644 --- a/fe/src/test/java/org/apache/doris/catalog/UserPropertyTest.java +++ b/fe/src/test/java/org/apache/doris/catalog/UserPropertyTest.java @@ -30,6 +30,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -41,6 +42,7 @@ import java.util.List; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class }) public class UserPropertyTest { @Test diff --git a/fe/src/test/java/org/apache/doris/clone/CloneTest.java b/fe/src/test/java/org/apache/doris/clone/CloneTest.java index 5bfa053d..20d5b5d3 100644 --- a/fe/src/test/java/org/apache/doris/clone/CloneTest.java +++ b/fe/src/test/java/org/apache/doris/clone/CloneTest.java @@ -51,7 +51,7 @@ import java.util.List; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class }) public class CloneTest { private Clone clone; diff --git a/fe/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java b/fe/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java index d81cc2b2..6e4d0091 100644 --- a/fe/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java +++ b/fe/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java @@ -51,7 +51,7 @@ import java.io.IOException; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class SystemInfoServiceTest { diff --git a/fe/src/test/java/org/apache/doris/common/proc/BackendProcNodeTest.java b/fe/src/test/java/org/apache/doris/common/proc/BackendProcNodeTest.java index 370d985a..a3d32d1a 100644 --- a/fe/src/test/java/org/apache/doris/common/proc/BackendProcNodeTest.java +++ b/fe/src/test/java/org/apache/doris/common/proc/BackendProcNodeTest.java @@ -36,7 +36,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class BackendProcNodeTest { private Backend b1; diff --git a/fe/src/test/java/org/apache/doris/common/proc/BackendsProcDirTest.java b/fe/src/test/java/org/apache/doris/common/proc/BackendsProcDirTest.java index cdc472cf..af2304c5 100644 --- a/fe/src/test/java/org/apache/doris/common/proc/BackendsProcDirTest.java +++ b/fe/src/test/java/org/apache/doris/common/proc/BackendsProcDirTest.java @@ -38,7 +38,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class BackendsProcDirTest { private static Backend b1; diff --git a/fe/src/test/java/org/apache/doris/load/DppConfigTest.java b/fe/src/test/java/org/apache/doris/load/DppConfigTest.java index a218267f..588e7bd5 100644 --- a/fe/src/test/java/org/apache/doris/load/DppConfigTest.java +++ b/fe/src/test/java/org/apache/doris/load/DppConfigTest.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -40,6 +41,7 @@ import java.util.Map; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class }) public class DppConfigTest { diff --git a/fe/src/test/java/org/apache/doris/load/DppSchedulerTest.java b/fe/src/test/java/org/apache/doris/load/DppSchedulerTest.java index 812cfc65..9fad142f 100644 --- a/fe/src/test/java/org/apache/doris/load/DppSchedulerTest.java +++ b/fe/src/test/java/org/apache/doris/load/DppSchedulerTest.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -41,6 +42,7 @@ import java.util.Set; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Util.class) public class DppSchedulerTest { private DppScheduler dppScheduler; diff --git a/fe/src/test/java/org/apache/doris/load/LoadCheckerTest.java b/fe/src/test/java/org/apache/doris/load/LoadCheckerTest.java index 502c7960..f69ca373 100644 --- a/fe/src/test/java/org/apache/doris/load/LoadCheckerTest.java +++ b/fe/src/test/java/org/apache/doris/load/LoadCheckerTest.java @@ -42,6 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -53,6 +54,7 @@ import java.util.Map; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({LoadChecker.class, Catalog.class}) public class LoadCheckerTest { private long dbId; diff --git a/fe/src/test/java/org/apache/doris/load/LoadJobTest.java b/fe/src/test/java/org/apache/doris/load/LoadJobTest.java index 0bf7ff14..21a6385c 100644 --- a/fe/src/test/java/org/apache/doris/load/LoadJobTest.java +++ b/fe/src/test/java/org/apache/doris/load/LoadJobTest.java @@ -37,6 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -51,6 +52,7 @@ import java.util.Map; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({Catalog.class}) public class LoadJobTest { diff --git a/fe/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java b/fe/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java index aa6fac65..fd85a66d 100644 --- a/fe/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java +++ b/fe/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java @@ -25,6 +25,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -35,6 +36,7 @@ import java.io.FileOutputStream; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class }) public class TabletLoadInfoTest { diff --git a/fe/src/test/java/org/apache/doris/mysql/MysqlHandshakePacketTest.java b/fe/src/test/java/org/apache/doris/mysql/MysqlHandshakePacketTest.java index 23873f73..d503fbae 100644 --- a/fe/src/test/java/org/apache/doris/mysql/MysqlHandshakePacketTest.java +++ b/fe/src/test/java/org/apache/doris/mysql/MysqlHandshakePacketTest.java @@ -24,12 +24,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import java.nio.ByteBuffer; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({MysqlPassword.class}) public class MysqlHandshakePacketTest { private byte[] buf; diff --git a/fe/src/test/java/org/apache/doris/mysql/MysqlProtoTest.java b/fe/src/test/java/org/apache/doris/mysql/MysqlProtoTest.java index 2a1ee29f..786efdfd 100644 --- a/fe/src/test/java/org/apache/doris/mysql/MysqlProtoTest.java +++ b/fe/src/test/java/org/apache/doris/mysql/MysqlProtoTest.java @@ -42,7 +42,7 @@ import java.nio.channels.SocketChannel; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({Catalog.class, ConnectContext.class, MysqlPassword.class, UserPropertyMgr.class}) public class MysqlProtoTest { private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(MysqlProtoTest.class); @@ -203,4 +203,4 @@ public void testRead() throws UnsupportedEncodingException { Assert.assertEquals("you have dream too", new String(MysqlProto.readEofString(buffer))); } -} \ No newline at end of file +} diff --git a/fe/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java b/fe/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java index 13b154d1..d263290d 100644 --- a/fe/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java +++ b/fe/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java @@ -51,7 +51,7 @@ import org.apache.doris.common.FeConstants; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class CreateTableInfoTest { private Catalog catalog; diff --git a/fe/src/test/java/org/apache/doris/qe/ConnectSchedulerTest.java b/fe/src/test/java/org/apache/doris/qe/ConnectSchedulerTest.java index 26e48374..d84048be 100644 --- a/fe/src/test/java/org/apache/doris/qe/ConnectSchedulerTest.java +++ b/fe/src/test/java/org/apache/doris/qe/ConnectSchedulerTest.java @@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicLong; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ConnectScheduler.class, MysqlProto.class, ConnectContext.class}) public class ConnectSchedulerTest { private static final Logger LOG = LoggerFactory.getLogger(ConnectScheduler.class); @@ -172,4 +172,4 @@ public void testNegotiateIOException() throws InterruptedException, IOException PowerMock.replay(MysqlProto.class); Assert.assertTrue(scheduler.submit(new ConnectContext(EasyMock.createMock(SocketChannel.class)))); } -} \ No newline at end of file +} diff --git a/fe/src/test/java/org/apache/doris/qe/MultiLoadMgrTest.java b/fe/src/test/java/org/apache/doris/qe/MultiLoadMgrTest.java index 3cc00ab2..96a68de8 100644 --- a/fe/src/test/java/org/apache/doris/qe/MultiLoadMgrTest.java +++ b/fe/src/test/java/org/apache/doris/qe/MultiLoadMgrTest.java @@ -36,7 +36,7 @@ import java.util.List; @RunWith(PowerMockRunner.class) -@PowerMockIgnore("org.apache.log4j.*") +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest(Catalog.class) public class MultiLoadMgrTest { private Catalog catalog; @@ -74,4 +74,4 @@ public void testStartDup() throws DdlException { mgr.startMulti("testDb", "1", null); mgr.startMulti("testDb", "1", null); } -} \ No newline at end of file +} diff --git a/fe/src/test/java/org/apache/doris/qe/VariableMgrTest.java b/fe/src/test/java/org/apache/doris/qe/VariableMgrTest.java index 2570b58b..9cd25211 100644 --- a/fe/src/test/java/org/apache/doris/qe/VariableMgrTest.java +++ b/fe/src/test/java/org/apache/doris/qe/VariableMgrTest.java @@ -33,6 +33,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.slf4j.Logger; @@ -41,6 +42,7 @@ import java.util.List; @RunWith(PowerMockRunner.class) +@PowerMockIgnore({ "org.apache.log4j.*", "javax.management.*" }) @PrepareForTest({ Catalog.class }) public class VariableMgrTest { private static final Logger LOG = LoggerFactory.getLogger(VariableMgrTest.class); @@ -126,4 +128,4 @@ public void testReadOnly() throws AnalysisException, DdlException { Assert.fail("No exception throws."); } -} \ No newline at end of file +} diff --git a/run-ut.sh b/run-ut.sh index f56470f1..ad932c87 100755 --- a/run-ut.sh +++ b/run-ut.sh @@ -25,7 +25,7 @@ export DORIS_HOME=${ROOT} . ${DORIS_HOME}/env.sh -PARALLEL=8 +PARALLEL=$[$(nproc)/4+1] # Check args usage() { @@ -90,7 +90,7 @@ fi cd ${DORIS_HOME}/be/build/ cmake ../ -DMAKE_TEST=ON -make -j8 +make -j${PARALLEL} if [ ${RUN} -ne 1 ]; then echo "Finished" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@doris.apache.org For additional commands, e-mail: dev-h...@doris.apache.org