diff options
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | src/cls/Makefile.am | 4 | ||||
| -rw-r--r-- | src/java/Makefile.am | 3 | ||||
| -rw-r--r-- | src/java/test/com/ceph/fs/CephAllTests.java | 13 | ||||
| -rw-r--r-- | src/mon/OSDMonitor.cc | 2 | ||||
| -rw-r--r-- | src/os/FileStore.cc | 2 | ||||
| -rw-r--r-- | src/rgw/Makefile.am | 5 | ||||
| -rw-r--r-- | src/test/Makefile.am | 10 |
8 files changed, 29 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac index 1478adfce79..bdea8b18ceb 100644 --- a/configure.ac +++ b/configure.ac @@ -333,14 +333,18 @@ if test "x$enable_cephfs_java" = "xyes"; then # setup defaults for Debian default-jdk package (without --with-jdk-dir) AS_IF([test -z "$with_jdk_dir"], [ - # This works with Debian's default-jdk package - dir='/usr/lib/jvm/default-java/' - javac_prog=`find $dir -name javac | head -n 1` - AS_IF([test -x "$javac_prog"], [ - EXTRA_JDK_BIN_DIR=`dirname $javac_prog`]) - jnih=`find $dir -name jni.h | head -n 1` - AS_IF([test -r "$jnih"], [ - EXTRA_JDK_INC_DIR=`dirname $jnih`])]) + # This works with Debian's and CentOS' default-jdk package + for dir in '/usr/lib/jvm/default-java/' '/usr/lib/jvm/java/' ; do + # only test if a suitable path has not yet been found + AS_IF([test "$EXTRA_JDK_BIN_DIR" == ""], [ + AS_IF([test -x "$javac_prog"], [ + EXTRA_JDK_BIN_DIR=`dirname $javac_prog`]) + jnih=`find $dir -name jni.h | head -n 1` + AS_IF([test -r "$jnih"], [ + EXTRA_JDK_INC_DIR=`dirname $jnih`]) + ]) + done + ]) # cephfs_java_test only makes sense if java is already turned on # setup CLASSPATH for Debian default junit4.jar package @@ -368,10 +372,6 @@ if test "x$enable_cephfs_java" = "xyes"; then CLASSPATH=$CLASSPATH:$EXTRA_CLASSPATH_JAR export CLASSPATH AC_MSG_NOTICE([classpath - $CLASSPATH]) - AS_IF([test "$have_junit4" = "1"], [ - AC_CHECK_CLASS([org.junit.rules.ExternalResource], [], [ - AC_MSG_NOTICE(Could not find org.junit.rules.ExternalResource) - have_junit4=0])]) # Check for jni.h CPPFLAGS_save=$CPPFLAGS diff --git a/src/cls/Makefile.am b/src/cls/Makefile.am index 0c04c64faa7..2d3d43cb1e3 100644 --- a/src/cls/Makefile.am +++ b/src/cls/Makefile.am @@ -59,11 +59,13 @@ libcls_lock_client_la_SOURCES = \ cls/lock/cls_lock_types.cc \ cls/lock/cls_lock_ops.cc noinst_LTLIBRARIES += libcls_lock_client.la +DENCODER_DEPS += libcls_lock_client.la libcls_refcount_client_la_SOURCES = \ cls/refcount/cls_refcount_client.cc \ cls/refcount/cls_refcount_ops.cc noinst_LTLIBRARIES += libcls_refcount_client.la +DENCODER_DEPS += libcls_refcount_client.la libcls_version_client_a_SOURCES = \ cls/version/cls_version_client.cc \ @@ -81,12 +83,14 @@ libcls_replica_log_client_a_SOURCES = \ cls/replica_log/cls_replica_log_ops.cc \ cls/replica_log/cls_replica_log_client.cc noinst_LIBRARIES += libcls_replica_log_client.a +DENCODER_DEPS += libcls_replica_log_client.a libcls_rgw_client_la_SOURCES = \ cls/rgw/cls_rgw_client.cc \ cls/rgw/cls_rgw_types.cc \ cls/rgw/cls_rgw_ops.cc noinst_LTLIBRARIES += libcls_rgw_client.la +DENCODER_DEPS += libcls_rgw_client.la libcls_rbd_client_la_SOURCES = cls/rbd/cls_rbd_client.cc noinst_LTLIBRARIES += libcls_rbd_client.la diff --git a/src/java/Makefile.am b/src/java/Makefile.am index ac7e86cf9fa..8b28f839e46 100644 --- a/src/java/Makefile.am +++ b/src/java/Makefile.am @@ -64,7 +64,6 @@ BUILT_SOURCES = $(JAVA_H) if HAVE_JUNIT4 JAVA_TEST_CLASSES = $(JAVA_TEST_SRC:test/%.java=%.class) -ESCAPED_JAVA_TEST_CLASSES = com/ceph/fs/CephAllTests\$$1.class CEPH_TEST_PROXY=test/com/ceph/fs/CephMountTest.class @@ -73,7 +72,7 @@ $(CEPH_TEST_PROXY): $(JAVA_TEST_SRC) $(CEPH_PROXY) $(JAVAC) -source 1.5 -target 1.5 -Xlint:-options test/com/ceph/fs/*.java libcephfs-test.jar: $(CEPH_TEST_PROXY) - $(JAR) cf $@ $(JAVA_TEST_CLASSES:%=-C test %) $(ESCAPED_JAVA_TEST_CLASSES:%=-C test %) + $(JAR) cf $@ $(JAVA_TEST_CLASSES:%=-C test %) java_DATA += libcephfs-test.jar diff --git a/src/java/test/com/ceph/fs/CephAllTests.java b/src/java/test/com/ceph/fs/CephAllTests.java index 71c2ddfee96..039ad6da3b7 100644 --- a/src/java/test/com/ceph/fs/CephAllTests.java +++ b/src/java/test/com/ceph/fs/CephAllTests.java @@ -23,7 +23,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.UUID; import org.junit.*; -import org.junit.rules.ExternalResource; import org.junit.runners.Suite; import org.junit.runner.RunWith; import static org.junit.Assert.*; @@ -42,16 +41,4 @@ import static org.junit.Assert.*; */ public class CephAllTests{ - @Rule - public static ExternalResource testRule = new ExternalResource(){ - @Override - protected void before() throws Throwable{ - // Add debugging messages or setup code here - }; - - @Override - protected void after(){ - // Add debugging messages or cleanup code here - }; - }; } diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 36fe6d345f2..9643b33e34b 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2154,7 +2154,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m) osdmap.get_inst(i)); } r = 0; - ss << " instructed to " << whostr; + ss << " instructed to " << pvec.back(); } else { long osd = parse_osd_id(whostr.c_str(), &ss); if (osd < 0) { diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 66581bcde38..5d9e9d1482d 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -4152,7 +4152,7 @@ int FileStore::_collection_move_rename(coll_t oldcid, const hobject_t& oldoid, const SequencerPosition& spos) { dout(15) << __func__ << " " << c << "/" << o << " from " << oldcid << "/" << oldoid << dendl; - int r; + int r = 0; int dstcmp, srccmp; dstcmp = _check_replay_guard(c, o, spos); diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am index b812d908569..24060b52e25 100644 --- a/src/rgw/Makefile.am +++ b/src/rgw/Makefile.am @@ -93,11 +93,6 @@ DENCODER_SOURCES += \ rgw/rgw_common.cc \ rgw/rgw_env.cc \ rgw/rgw_json_enc.cc -DENCODER_DEPS += \ - libcls_lock_client.la \ - libcls_rgw_client.la \ - libcls_replica_log_client.a \ - libcls_refcount_client.la endif # WITH_RADOSGW diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 80ec69425ca..9ce4a246673 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -384,6 +384,16 @@ unittest_bufferlist_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_bufferlist_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_PROGRAMS += unittest_bufferlist +unittest_crc32c_SOURCES = test/common/test_crc32c.cc +unittest_crc32c_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) +unittest_crc32c_CXXFLAGS = $(UNITTEST_CXXFLAGS) +check_PROGRAMS += unittest_crc32c + +unittest_arch_SOURCES = test/test_arch.c +unittest_arch_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) +unittest_arch_CXXFLAGS = $(UNITTEST_CXXFLAGS) +check_PROGRAMS += unittest_arch + unittest_crypto_SOURCES = test/crypto.cc unittest_crypto_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_crypto_CXXFLAGS = $(UNITTEST_CXXFLAGS) |