Solaris build fixes

diff --git a/system.h b/system.h
index eca78a68b59ca126f36155a5d9db760c77db6582..5309fc5f6e0e62e9745a1ee51eedc4b7787a4da7 100644 (file)
--- a/system.h
+++ b/system.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Joel Rosdahl
+ * Copyright (C) 2010-2012 Joel Rosdahl
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -47,6 +47,8 @@
 #include <time.h>
 #include <utime.h>
 
+extern char **environ;
+
 #if !HAVE_VSNPRINTF
   int rpl_vsnprintf(char *, size_t, const char *, va_list);
   #define vsnprintf rpl_vsnprintf

diff --git a/test.sh b/test.sh
index 86b402b08823b345e1dc3a81f903a6e52eb915c0..f1ea65c46a0e7014508706fac8eca8cb065f7971 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -356,7 +356,7 @@ touch override_path_compiler_executed
 EOF
     chmod +x $override_path/cc
     CCACHE_PATH=$override_path $CCACHE cc -c test1.c
-    if [ ! -e override_path_compiler_executed ]; then
+    if [ ! -f override_path_compiler_executed ]; then
         test_failed "CCACHE_PATH had no effect"
     fi
 

diff --git a/test/test_conf.c b/test/test_conf.c
index 27ab441639852aeb6e0b0d88503f419da877eda3..db1f381ec39aa5698f5d6f2e2b81ff8c82becaea 100644 (file)
--- a/test/test_conf.c
+++ b/test/test_conf.c
@@ -306,7 +306,7 @@ TEST(conf_update_from_environment)
        CHECK(conf_update_from_environment(conf, &errmsg));
        CHECK(conf->compression);
 
-       unsetenv("CCACHE_COMPRESS");
+       putenv("CCACHE_COMPRESS"); /* unsetenv isn't portable */
        putenv("CCACHE_NOCOMPRESS=1");
        CHECK(conf_update_from_environment(conf, &errmsg));
        CHECK(!conf->compression);

diff --git a/test/test_util.c b/test/test_util.c
index 19c0afe0d9f371f4910599ff4e9b3f7f675f0436..7a9fbcdb2447fc199c9c66aa993f5dd4fe745a31 100644 (file)
--- a/test/test_util.c
+++ b/test/test_util.c
@@ -127,7 +127,7 @@ TEST(format_parsable_size_with_suffix)
 
 TEST(parse_size_with_suffix)
 {
-       size_t size;
+       uint64_t size;
        size_t i;
        struct { const char *size; int64_t expected; } sizes[] = {
                {"0", 0},
@@ -138,13 +138,13 @@ TEST(parse_size_with_suffix)
                {"1.1 M",     1.1 * 1000 * 1000},
                {"438.55M",   438.55 * 1000 * 1000},
                {"1 G",       1 * 1000 * 1000 * 1000},
-               {"2T",        2L * 1000 * 1000 * 1000 * 1000},
+               {"2T",        (int64_t)2 * 1000 * 1000 * 1000 * 1000},
 
                {"78 Ki",     78 * 1024},
                {"1.1Mi",     1.1 * 1024 * 1024},
                {"438.55 Mi", 438.55 * 1024 * 1024},
                {"1Gi",       1 * 1024 * 1024 * 1024},
-               {"2 Ti",      2L * 1024 * 1024 * 1024 * 1024},
+               {"2 Ti",      (int64_t)2 * 1024 * 1024 * 1024 * 1024},
 
        };