Fix unit tests and coverage
1. Fix the NPE that happened because hasVideoCall in CallsManager was
not visible to the unit tests
2. Add additional env variables to ensure that emma is in the classpath
when generating code coverage
Test: unit tests
Change-Id: Ibd621267b4af4e20c41458eb674fd120ca0a1859
diff --git a/scripts/telecom_testing.sh b/scripts/telecom_testing.sh
index 6884f5f..e6423a3 100644
--- a/scripts/telecom_testing.sh
+++ b/scripts/telecom_testing.sh
@@ -51,15 +51,15 @@
# Build and exit script early if build fails
if [ $coverage = true ] ; then
- emma_opt="EMMA_INSTRUMENT_STATIC=true"
+ emma_opt="EMMA_INSTRUMENT=true LOCAL_EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true"
else
- emma_opt="EMMA_INSTRUMENT_STATIC=false"
+ emma_opt="EMMA_INSTRUMENT=false"
fi
if [ $installwdep = true ] ; then
- mmma -j40 "packages/services/Telecomm/tests" ${emma_opt}
+ (export ${emma_opt}; mmma -j40 "packages/services/Telecomm/tests")
else
- mmm "packages/services/Telecomm/tests" ${emma_opt}
+ (export ${emma_opt}; mmm "packages/services/Telecomm/tests")
fi
if [ $? -ne 0 ] ; then
echo "Make failed! try using -a instead of -i if building with coverage"