You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ns...@apache.org on 2018/07/27 21:24:23 UTC
[incubator-mxnet] branch master updated: make skiptest work (#11889)
This is an automated email from the ASF dual-hosted git repository.
nswamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new a8c8737 make skiptest work (#11889)
a8c8737 is described below
commit a8c873742c25a6cd4b78c6a4d8e1026378fda77d
Author: Lanking <la...@live.com>
AuthorDate: Fri Jul 27 14:24:15 2018 -0700
make skiptest work (#11889)
---
Makefile | 10 +++++-----
scala-package/core/pom.xml | 6 +++---
scala-package/examples/pom.xml | 6 +++---
scala-package/infer/pom.xml | 6 +++---
scala-package/pom.xml | 1 +
5 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 88f7dd9..18661aa 100644
--- a/Makefile
+++ b/Makefile
@@ -608,7 +608,7 @@ scalaintegrationtest:
scalainstall:
(cd $(ROOTDIR)/scala-package; \
- mvn install -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) -DskipTests -Dcxx="$(CXX)" \
+ mvn install -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) -DskipTests=true -Dcxx="$(CXX)" \
-Dbuild.platform="$(SCALA_PKG_PROFILE)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
@@ -617,23 +617,23 @@ scalarelease-dryrun:
(cd $(ROOTDIR)/scala-package; \
mvn release:clean release:prepare -DdryRun=true -DautoVersionSubmodules=true \
-Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
- -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+ -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests=true\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
scalarelease-prepare:
(cd $(ROOTDIR)/scala-package; \
mvn release:clean release:prepare -DautoVersionSubmodules=true \
-Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
- -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+ -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests=true\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
scalarelease-perform:
(cd $(ROOTDIR)/scala-package; \
mvn release:perform -DautoVersionSubmodules=true \
-Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \
- -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
+ -Darguments=""-Dbuild\.platform=\""$(SCALA_PKG_PROFILE)\""\ -DskipTests=true\ -Dcflags=\""$(CFLAGS)\""\ -Dcxx=\""$(CXX)\""\ -Dldflags=\""$(LDFLAGS)\""\ -Dlddeps=\""$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a\"""")
scaladeploy:
(cd $(ROOTDIR)/scala-package; \
- mvn deploy -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \-DskipTests -Dcxx="$(CXX)" \
+ mvn deploy -Papache-release,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) \-DskipTests=true -Dcxx="$(CXX)" \
-Dbuild.platform="$(SCALA_PKG_PROFILE)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
index 134e0a5..1606197 100644
--- a/scala-package/core/pom.xml
+++ b/scala-package/core/pom.xml
@@ -17,13 +17,13 @@
<profile>
<id>unittest</id>
<properties>
- <skiptest>false</skiptest>
+ <skipTests>false</skipTests>
</properties>
</profile>
<profile>
<id>integrationtest</id>
<properties>
- <skiptest>true</skiptest>
+ <skipTests>true</skipTests>
</properties>
</profile>
<profile>
@@ -74,7 +74,7 @@
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
- <skipTests>${skiptest}</skipTests>
+ <skipTests>${skipTests}</skipTests>
<argLine>
-Djava.library.path=${project.parent.basedir}/native/${platform}/target \
-Dlog4j.configuration=file://${project.basedir}/src/test/resources/log4j.properties
diff --git a/scala-package/examples/pom.xml b/scala-package/examples/pom.xml
index 9a98f74..d24785b 100644
--- a/scala-package/examples/pom.xml
+++ b/scala-package/examples/pom.xml
@@ -17,13 +17,13 @@
<profile>
<id>unittest</id>
<properties>
- <skiptest>true</skiptest>
+ <skipTests>true</skipTests>
</properties>
</profile>
<profile>
<id>integrationtest</id>
<properties>
- <skiptest>false</skiptest>
+ <skipTests>false</skipTests>
</properties>
</profile>
<profile>
@@ -134,7 +134,7 @@
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
- <skipTests>${skiptest}</skipTests>
+ <skipTests>${skipTests}</skipTests>
<argLine>
-Djava.library.path=${project.parent.basedir}/native/${platform}/target \
-Dlog4j.configuration=file://${project.basedir}/src/test/resources/log4j.properties
diff --git a/scala-package/infer/pom.xml b/scala-package/infer/pom.xml
index 3425579..71c85af 100644
--- a/scala-package/infer/pom.xml
+++ b/scala-package/infer/pom.xml
@@ -17,13 +17,13 @@
<profile>
<id>unittest</id>
<properties>
- <skiptest>false</skiptest>
+ <skipTests>false</skipTests>
</properties>
</profile>
<profile>
<id>integrationtest</id>
<properties>
- <skiptest>true</skiptest>
+ <skipTests>true</skipTests>
</properties>
</profile>
<profile>
@@ -74,7 +74,7 @@
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<configuration>
- <skipTests>${skiptest}</skipTests>
+ <skipTests>${skipTests}</skipTests>
<argLine>
-Djava.library.path=${project.parent.basedir}/native/${platform}/target \
-Dlog4j.configuration=file://${project.basedir}/src/test/resources/log4j.properties
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index c4f1620..3511f4a 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -228,6 +228,7 @@
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
+ <skipTests>${skipTests}</skipTests>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
<filereports>WDF TestSuite.txt</filereports>