aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-02-25 14:43:34 +0000
committerConor Curran <conor.curran@canonical.com>2010-02-25 14:43:34 +0000
commit4cb7db538df7b4e69e49ab047f401b8ba480f224 (patch)
treec2220dcc1a485df4c02424e0e235d50f46981307
parenta7952974571bf697b218cedacacd118e2e05e97e (diff)
downloadayatana-indicator-sound-4cb7db538df7b4e69e49ab047f401b8ba480f224.tar.gz
ayatana-indicator-sound-4cb7db538df7b4e69e49ab047f401b8ba480f224.tar.bz2
ayatana-indicator-sound-4cb7db538df7b4e69e49ab047f401b8ba480f224.zip
path parsing fixed - tests are now portable
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/test-indicator-sound.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dadc1e4..4404333 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ test_indicator_sound_CFLAGS = \
$(APPLET_CFLAGS) \
-Wall -Werror \
-I$(srcdir) \
- -DBUILD_DIR="\"$(INDICATORDIR)"\"
+ -DTOP_BUILD_DIR="\"${abs_top_builddir}\""
test_indicator_sound_LDADD = \
$(APPLET_LIBS) \
diff --git a/tests/test-indicator-sound.c b/tests/test-indicator-sound.c
index 0885bb5..0de09b7 100644
--- a/tests/test-indicator-sound.c
+++ b/tests/test-indicator-sound.c
@@ -23,14 +23,14 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
void test_libindicator_sound_init()
{
- IndicatorObject * sound_menu = indicator_object_new_from_file(BUILD_DIR "/.libs/libsoundmenu.so");
+ IndicatorObject * sound_menu = indicator_object_new_from_file(TOP_BUILD_DIR "/src/.libs/libsoundmenu.so");
g_assert(sound_menu != NULL);
g_object_unref(G_OBJECT(sound_menu));
}
void test_libindicator_determine_state()
{
- IndicatorObject * sound_menu = indicator_object_new_from_file(BUILD_DIR "/.libs/libsoundmenu.so");
+ IndicatorObject * sound_menu = indicator_object_new_from_file(TOP_BUILD_DIR "/src/.libs/libsoundmenu.so");
get_icon(sound_menu);
determine_state_from_volume(40);