Fixed DBTestUniversalManualCompactionOutputPathId test

Summary:
Fixed DBTestUniversalManualCompactionOutputPathId test
by changing the expected number of files when setting up
the test as flushes no-longer preempt compactions
in patch https://reviews.facebook.net/D41931.

Also, include db_universal_copaction_test in make all check.

Test Plan: db_universal_copaction_test

Reviewers: igor, sdong, IslamAbdelRahman, anthony

Reviewed By: anthony

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D42639

Makefile

@@ -224,6 +224,7 @@ TESTS = \
 	db_compaction_filter_test \
 	db_dynamic_level_test \
 	db_tailing_iter_test \
+	db_universal_compaction_test \
 	block_hash_index_test \
 	autovector_test \
 	column_family_test \

db/db_universal_compaction_test.cc

@@ -688,8 +688,8 @@ TEST_P(DBTestUniversalManualCompactionOutputPathId,
   CreateAndReopenWithCF({"pikachu"}, options);
   MakeTables(3, "p", "q", 1);
   dbfull()->TEST_WaitForCompact();
-  ASSERT_EQ(3, TotalLiveFiles(1));
+  ASSERT_EQ(2, TotalLiveFiles(1));
-  ASSERT_EQ(3, GetSstFileCount(options.db_paths[0].path));
+  ASSERT_EQ(2, GetSstFileCount(options.db_paths[0].path));
   ASSERT_EQ(0, GetSstFileCount(options.db_paths[1].path));
 
   // Full compaction to DB path 0