diff options
| author | George Joseph <gjoseph@digium.com> | 2017-01-27 14:51:01 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-01-27 14:51:01 -0600 |
| commit | bcb2c1f62ff9e427313dbb54e1a56fc31976fedb (patch) | |
| tree | 096be8fbc4bf862ebbff0772a95eed6b3f815a89 | |
| parent | d6f67df8ce32a1ffd010ea6e9cafe5b0142f5f37 (diff) | |
| parent | cd2677f966574980caeb6da2cdcaa2dc5ec1e83f (diff) | |
Merge "tests: use datadir for sound files" into 13
| -rw-r--r-- | apps/app_voicemail.c | 6 | ||||
| -rw-r--r-- | tests/test_voicemail_api.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index bee684e4e..1c75105dd 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -14316,7 +14316,7 @@ AST_TEST_DEFINE(test_voicemail_vmsayname) ast_log(AST_LOG_WARNING, "Failed to make test directory\n"); goto exit_vmsayname_test; } - snprintf(dir, sizeof(dir), "%s/sounds/beep.gsm", ast_config_AST_VAR_DIR); + snprintf(dir, sizeof(dir), "%s/sounds/beep.gsm", ast_config_AST_DATA_DIR); snprintf(dir2, sizeof(dir2), "%s%s/%s/greet.gsm", VM_SPOOL_DIR, TEST_CONTEXT, TEST_EXTENSION); /* we're not going to hear the sound anyway, just use a valid gsm audio file */ if ((res = symlink(dir, dir2))) { @@ -14562,8 +14562,8 @@ AST_TEST_DEFINE(test_voicemail_notify_endl) break; } - snprintf(attach, sizeof(attach), "%s/sounds/en/tt-weasels", ast_config_AST_VAR_DIR); - snprintf(attach2, sizeof(attach2), "%s/sounds/en/tt-somethingwrong", ast_config_AST_VAR_DIR); + snprintf(attach, sizeof(attach), "%s/sounds/en/tt-weasels", ast_config_AST_DATA_DIR); + snprintf(attach2, sizeof(attach2), "%s/sounds/en/tt-somethingwrong", ast_config_AST_DATA_DIR); if (!(vmu = find_user(&vmus, testcontext, testmailbox)) && !(vmu = find_or_create(testcontext, testmailbox))) { diff --git a/tests/test_voicemail_api.c b/tests/test_voicemail_api.c index 1e9ff32d5..188db4af5 100644 --- a/tests/test_voicemail_api.c +++ b/tests/test_voicemail_api.c @@ -462,7 +462,7 @@ static int test_vm_api_create_voicemail_files(const char *context, const char *m folder_path, snapshot->msg_number); snprintf(snd_path, sizeof(snd_path), "%s/msg%04u.gsm", folder_path, snapshot->msg_number); - snprintf(beep_path, sizeof(beep_path), "%s/sounds/en/beep.gsm", ast_config_AST_VAR_DIR); + snprintf(beep_path, sizeof(beep_path), "%s/sounds/en/beep.gsm", ast_config_AST_DATA_DIR); if (test_vm_api_create_voicemail_folder(folder_path)) { return 1; |