Skip to content
Snippets Groups Projects
Commit 3433f53d authored by Alexandre Savard's avatar Alexandre Savard
Browse files
parents 6f48de92 1ac2cc42
Branches
Tags
No related merge requests found
......@@ -19,18 +19,18 @@ make && make dep
popd
./configure --prefix=/usr
make clean
make -j 1
make -j
make doc
popd
# Run the unit tests for the daemon
# pushd sflphone-common/test
pushd sflphone-common/test
# Remove the previous XML test file
# rm -rf $(XML_RESULTS)
# make check
rm -rf $XML_RESULTS
make check
# if at least one test failed, exit
# ./test --xml || exit 1
# popd
./test --xml || exit 1
popd
# Compile the client
pushd sflphone-client-gnome
......
......@@ -30,9 +30,9 @@ test_SOURCES = \
instantmessagingtest.h \
instantmessagingtest.cpp \
siptest.h \
siptest.cpp \
sdptest.h \
sdptest.cpp
siptest.cpp
# sdptest.h \
# sdptest.cpp
LLIBS=$(CPPUNIT_LIBS) \
../src/sflphoned-logger.o \
......
......@@ -45,6 +45,7 @@ void HistoryTest::setUp()
history = new HistoryManager();
}
void HistoryTest::test_create_history_path()
{
_debug ("-------------------- HistoryTest::test_create_history_path --------------------\n");
......@@ -54,10 +55,9 @@ void HistoryTest::test_create_history_path()
std::string path;
cpath = getenv ("XDG_DATA_HOME");
(cpath != NULL) ? path = std::string (cpath) : path = std::string (HOMEDIR)
+ "/.local/share/sflphone/history";
(cpath != NULL) ? path = std::string (cpath) : path = std::string ("/") + HISTORY_SAMPLE;
result = history->create_history_path();
result = history->create_history_path(path);
CPPUNIT_ASSERT (result == 0);
CPPUNIT_ASSERT (!history->is_loaded ());
CPPUNIT_ASSERT (history->_history_path == path);
......@@ -70,7 +70,7 @@ void HistoryTest::test_load_history_from_file()
bool res;
Conf::ConfigTree history_list;
history->create_history_path();
history->create_history_path(HISTORY_SAMPLE);
res = history->load_history_from_file (&history_list);
CPPUNIT_ASSERT (history->is_loaded ());
......
......@@ -51,8 +51,8 @@ void HookManagerTest::testAddAction ()
int status;
status = urlhook->addAction ("http://www.google.ca/?arg1=arg1&arg2=nvls&x=2&y=45&z=1", "x-www-browser");
CPPUNIT_ASSERT (status == 0);
// status = urlhook->addAction ("http://www.google.ca/?arg1=arg1&arg2=nvls&x=2&y=45&z=1", "x-www-browser");
// CPPUNIT_ASSERT (status == 0);
}
void HookManagerTest::testLargeUrl ()
......
......@@ -54,7 +54,7 @@ preferences:
historyMaxCalls: 20
md5Hash: false
notifyMails: false
order: Account:1294850905/Account:1294850775/Account:1294850618/Account:1294849651/Account:1294849602/Account:1294849310/Account:1288964768/Account:1288964603/Account:1288964434/Account:1288964141/Account:1288964134/
order: Account:1302207377/Account:1302207262/Account:1302204136/Account:1302204108/Account:1294850905/Account:1294850775/Account:1294850618/Account:1294849651/Account:1294849602/Account:1294849310/Account:1288964768/Account:1288964603/Account:1288964434/Account:1288964141/Account:1288964134/
portNum: 5060
registrationExpire: 180
searchBarDisplay: true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment