Permalink
Browse files

cleaned up nuke and removed some obsolete tests.

  • Loading branch information...
1 parent 728fbde commit fcdabbe3c7835512cd47178a2bfb38b04f62304b @timburks timburks committed Jun 19, 2011
Showing with 3 additions and 31 deletions.
  1. +2 −2 Nukefile
  2. +1 −28 test/test_errors.nu
  3. +0 −1 tools/nuke
View
@@ -113,10 +113,10 @@ END)
(set @cflags (+ @cflags " -DHAVE_CONFIG_H"))
(ifDarwin
- (then (set @arch '("x86_64")))) ;; optionally add "ppc" or "ppc64" to the list
+ (then (set @arch '("i386")))) ;; optionally add "ppc" or "ppc64" to the list
(if (or isSnowLeopard isLion)
- (then (set @arch (append @arch '("i386")))))
+ (then (set @arch (append @arch '("x86_64")))))
(set @includes
((@inc_dirs map: (do (inc) " -I#{inc}")) join))
View
@@ -4,25 +4,10 @@
;; Copyright (c) 2007 Tim Burks, Radtastical Inc.
;; use these functions to call class construction operators outside of any class scope.
-(function misplaced-instance-method () (imethod foo is nil))
-(function misplaced-class-method () (cmethod foo is nil))
(function misplaced-ivar () (ivar (id) foo))
-(function misplaced-ivars () (ivars))
(class TestErrors is NuTestCase
- (- (id) testMisplacedInstanceMethod is
- (try
- (misplaced-instance-method)
- (catch (exception) (set myException exception)))
- (assert_equal "NuMisplacedDeclaration" (myException name)))
-
- (- (id) testMisplacedClassMethod is
- (try
- (misplaced-class-method)
- (catch (exception) (set myException exception)))
- (assert_equal "NuMisplacedDeclaration" (myException name)))
-
(- (id) testMisplacedIvar is
(try
(misplaced-ivar)
@@ -69,17 +54,5 @@
(try
((do (x y) (+ x y)) 1 2 3) ;; incorrect number of block arguments
(catch (exception) (set myException exception)))
- (assert_equal "NuIncorrectNumberOfArguments" (myException name)))
+ (assert_equal "NuIncorrectNumberOfArguments" (myException name))))
- (- (id) testNoInstanceVariable is
- (try
- (class TestClass is NSObject
- (- (id) accessMissingIvar is @foo))
- (((TestClass alloc) init) accessMissingIvar)
- (catch (exception) (set myException exception)))
- (assert_equal "NuNoInstanceVariable" (myException name))))
-
-
-
-
-
View
@@ -855,7 +855,6 @@ END)
;; an instance method of a NukeProject; so all instance variables in a Nukefile
;; belong to the NukeProject instance.
(class NukeProject is NSObject
- (ivar (id) datamodels (id) tasks (id) framework_install_path )
;; Get the dictionary of tasks managed by a project.
(- (id) tasks is @tasks)

0 comments on commit fcdabbe

Please sign in to comment.